1、注释掉esm_user_internal表 相关的内容。

2、推荐人功能修改。
3、增加血缘查询接口。
4、增加发票管理所需要的接口。

src/main/java/com/ydtech/components/OrderComponents.java

@@ -1,290 +1,274 @@
 package com.ydtech.components;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.model.EsmAgreement;
-import com.ydtech.modules.esm.model.EsmAgreementProd;
-import com.ydtech.modules.esm.model.EsmAgreementProdfee;
-import com.ydtech.modules.esm.model.EsmRetail;
-import com.ydtech.modules.esm.service.*;
-import com.ydtech.modules.ins.model.InsCommission;
-import com.ydtech.modules.ins.model.InsDeptFee;
-import com.ydtech.modules.ins.model.InsFeeDetail;
+import com.ydtech.modules.esm.service.EsmAgreementProdService;
+import com.ydtech.modules.esm.service.EsmAgreementProdfeeService;
+import com.ydtech.modules.esm.service.EsmAgreementService;
+import com.ydtech.modules.esm.service.EsmRetailService;
 import com.ydtech.modules.ins.model.InsOrder;
+import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.service.InsCommissionService;
 import com.ydtech.modules.ins.service.InsDeptFeeService;
 import com.ydtech.modules.ins.service.InsFeeDetailService;
 import com.ydtech.modules.ins.service.InsOrderService;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.annotation.Resource;
 
 @Component
 public class OrderComponents {
 
-    @Autowired
+    @Resource
     private EsmAgreementService esmAgreementService;
 
-    @Autowired
+    @Resource
     private EsmAgreementProdfeeService esmAgreementProdfeeService;
 
-    @Autowired
+    @Resource
     private InsFeeDetailService insFeeDetailService;
 
-    @Autowired
+    @Resource
     private InsDeptFeeService insDeptFeeService;
 
-    @Autowired
+    @Resource
     private InsCommissionService insCommissionService;
 
-    @Autowired
+    @Resource
     private EsmRetailService esmRetailService;
 
-    @Autowired
-    private EsmUserInternalService esmUserInternalService;
 
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
 
-    @Autowired
+    @Resource
     private InsOrderService insOrderService;
 
-    @Autowired
+    @Resource
     private SysDeptService sysDeptService;
 
-    @Autowired
+    @Resource
     private EsmAgreementProdService esmAgreementProdService;
 
-    @Autowired
-    private StringRedisTemplate redisTemplate;
-
-
-    /**
-     * 保存费用明细
-     *
-     * @param order
-     */
-    public void saveFeeDetail(InsOrder order) {
-        InsFeeDetail feeDetail = new InsFeeDetail();
-        feeDetail.setOrderno(order.getOrderno());
-        feeDetail.setQuoteno(order.getQuoteno());
-        feeDetail.setFeerate(order.getFeerate());  //交强手续费比例
-        feeDetail.setDisrate(order.getDisrate());  //商业手续费比例
-        BigDecimal jqfee = new BigDecimal(order.getJqpremium() * order.getFeerate() * 0.01);
-        jqfee = jqfee.setScale(2, BigDecimal.ROUND_HALF_UP);
-        feeDetail.setFeeamount(jqfee.doubleValue()); //交强手续费
-        BigDecimal syfee = new BigDecimal(order.getSypremium() * order.getDisrate() * 0.01);
-        syfee = syfee.setScale(2, BigDecimal.ROUND_HALF_UP);
-        feeDetail.setDisamount(syfee.doubleValue()); //商业手续费
-
-        feeDetail.setJqdiscountrate(order.getJqdiscountrate());
-        feeDetail.setSydiscountrate(order.getSydiscountrate());
-        BigDecimal jqDiscount = new BigDecimal(order.getJqpremium() * order.getJqdiscountrate() * 0.01);
-        jqDiscount = jqDiscount.setScale(2, RoundingMode.HALF_UP);
-        feeDetail.setJqdiscount(jqDiscount.doubleValue()); //交强优惠金额
-        BigDecimal syDiscount = new BigDecimal(order.getSypremium() * order.getSydiscountrate() * 0.01);
-        syDiscount = syDiscount.setScale(2, RoundingMode.HALF_UP);
-        feeDetail.setSydiscount(syDiscount.doubleValue()); //商业优惠金额
-
-        feeDetail.setJqpremium(order.getJqpremium());
-        feeDetail.setSypremium(order.getSypremium());
-        feeDetail.setTaxamount(order.getTaxamount());
-        feeDetail.setSumpremium(order.getSumpremium());
-        feeDetail.setInscompany(order.getInscompany());
-        feeDetail.setAgreeid(order.getAgreeid());
-        feeDetail.setAgreeprodid(order.getProductid());
-        EsmAgreement esmAgreement = esmAgreementService.selectByPk(order.getAgreeid());
-        if (esmAgreement != null) {
-            feeDetail.setAgreementcode(esmAgreement.getAgreementcode());
-            feeDetail.setAgreetype(esmAgreement.getAgreementtype());
-            feeDetail.setChannel(esmAgreement.getChannel());
-        }
-        feeDetail.setProducname(order.getProduct());
-        feeDetail.setAuditstatus("0");  //0未审核 1已审核
-
-        insFeeDetailService.insert(feeDetail);
-
-        //机构费用
-        InsDeptFee deptFee = new InsDeptFee();
-        deptFee.setOrderno(order.getOrderno());
-        deptFee.setQuoteno(order.getQuoteno());
-        deptFee.setAgreeid(order.getAgreeid());
-        deptFee.setAgreeprodid(order.getProductid());
-        deptFee.setAuditstatus("0");
-        deptFee.setSettlestatus("0");
-        List<EsmAgreementProdfee> prodfees = esmAgreementProdfeeService.selectList(" where agreeprodid=?", new Object[]{order.getProductid()});
-        for (EsmAgreementProdfee prodfee : prodfees) {
-            deptFee.setKeeprate(prodfee.getKeeprate() * 0.01);
-            BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getKeeprate() * 0.01);
-            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-            deptFee.setKeepamount(amount.doubleValue());
-            deptFee.setAddrate(prodfee.getAddrate() * 0.01);
-            amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getAddrate() * 0.01);
-            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-            deptFee.setAddamount(amount.doubleValue());
-            deptFee.setComlevel(prodfee.getComlevel());
-            if ("一级".equals(prodfee.getComlevel())) {
-                deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01
-            } else if ("二级".equals(prodfee.getComlevel())) {
-                deptFee.setComcode(order.getDeptid().substring(0, 4));
-            } else if ("三级".equals(prodfee.getComlevel())) {
-                deptFee.setComcode(order.getDeptid().substring(0, 6));
-            } else if ("四级".equals(prodfee.getComlevel())) {
-                deptFee.setComcode(order.getDeptid().substring(0, 8));
-            } else {
-                deptFee.setComcode(order.getDeptid().substring(0, 11));
-            }
-            insDeptFeeService.insert(deptFee);
-        }
-
-        saveRetail(order); //分销所占比例
-    }
-
-
-    /**
-     * 三级分销费用保存
-     *
-     * @param order
-     * @return
-     */
-    public double saveRetail(InsOrder order) {
-        double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{order.getDeptid(), "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(order.getUserid());
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                InsCommission commission = new InsCommission();
-                commission.setOrderno(order.getOrderno());
-                commission.setQuoteno(order.getQuoteno());
-                commission.setRefereescode(users.get(0).getId());
-                commission.setRefereesname(users.get(0).getName());
-                double rate = rateList.get(0) * 0.01;
-                commission.setCommissionrate(rate);
-                BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                commission.setCommissionamount(amount.doubleValue());
-                commission.setLevel("1");
-                commission.setAuditstatus("0");  //0未审核 1已审核
-                commission.setSettlestatus("0"); //0未结算 1已结算
-                commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                insCommissionService.insert(commission);
-
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    InsCommission commission = new InsCommission();
-                    commission.setOrderno(order.getOrderno());
-                    commission.setQuoteno(order.getQuoteno());
-                    commission.setRefereescode(users.get(i).getId());
-                    commission.setRefereesname(users.get(i).getName());
-                    double rate = rateList.get(i) * 0.01;
-                    commission.setCommissionrate(rate);
-                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                    commission.setCommissionamount(amount.doubleValue());
-                    commission.setLevel(String.valueOf(i + 1));
-                    commission.setAuditstatus("0");  //0未审核 1已审核
-                    commission.setSettlestatus("0"); //0未结算 1已结算
-                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                    insCommissionService.insert(commission);
-
-                    retailRate += rateList.get(i);
-                }
+//    @Resource
+//    private StringRedisTemplate redisTemplate;
 
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    InsCommission commission = new InsCommission();
-                    commission.setOrderno(order.getOrderno());
-                    commission.setQuoteno(order.getQuoteno());
-                    commission.setRefereescode(users.get(i).getId());
-                    commission.setRefereesname(users.get(i).getName());
-                    double rate = rateList.get(i) * 0.01;
-                    commission.setCommissionrate(rate);
-                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                    amount = amount.setScale(2, RoundingMode.HALF_UP);
-                    commission.setCommissionamount(amount.doubleValue());
-                    commission.setLevel(String.valueOf(i + 1));
-                    commission.setAuditstatus("0");  //0未审核 1已审核
-                    commission.setSettlestatus("0"); //0未结算 1已结算
-                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                    insCommissionService.insert(commission);
-
-                    retailRate += rateList.get(i);
-                }
-            }
-        }
-        return retailRate;
-    }
 
-    /**
-     * 分销费用统计
-     *
-     * @param deptid
-     * @param userid
-     * @return
-     */
-    public double countRetail(String deptid, String userid) {
-        double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && !list.isEmpty() && !users.isEmpty() && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
+//    /**
+//     * 保存费用明细
+//     *
+//     * @param order
+//     */
+//    public void saveFeeDetail(InsOrder order) {
+//        InsFeeDetail feeDetail = new InsFeeDetail();
+//        feeDetail.setOrderno(order.getOrderno());
+//        feeDetail.setQuoteno(order.getQuoteno());
+//        feeDetail.setFeerate(order.getFeerate());  //交强手续费比例
+//        feeDetail.setDisrate(order.getDisrate());  //商业手续费比例
+//        BigDecimal jqfee = new BigDecimal(order.getJqpremium() * order.getFeerate() * 0.01);
+//        jqfee = jqfee.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        feeDetail.setFeeamount(jqfee.doubleValue()); //交强手续费
+//        BigDecimal syfee = new BigDecimal(order.getSypremium() * order.getDisrate() * 0.01);
+//        syfee = syfee.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        feeDetail.setDisamount(syfee.doubleValue()); //商业手续费
+//
+//        feeDetail.setJqdiscountrate(order.getJqdiscountrate());
+//        feeDetail.setSydiscountrate(order.getSydiscountrate());
+//        BigDecimal jqDiscount = new BigDecimal(order.getJqpremium() * order.getJqdiscountrate() * 0.01);
+//        jqDiscount = jqDiscount.setScale(2, RoundingMode.HALF_UP);
+//        feeDetail.setJqdiscount(jqDiscount.doubleValue()); //交强优惠金额
+//        BigDecimal syDiscount = new BigDecimal(order.getSypremium() * order.getSydiscountrate() * 0.01);
+//        syDiscount = syDiscount.setScale(2, RoundingMode.HALF_UP);
+//        feeDetail.setSydiscount(syDiscount.doubleValue()); //商业优惠金额
+//
+//        feeDetail.setJqpremium(order.getJqpremium());
+//        feeDetail.setSypremium(order.getSypremium());
+//        feeDetail.setTaxamount(order.getTaxamount());
+//        feeDetail.setSumpremium(order.getSumpremium());
+//        feeDetail.setInscompany(order.getInscompany());
+//        feeDetail.setAgreeid(order.getAgreeid());
+//        feeDetail.setAgreeprodid(order.getProductid());
+//        EsmAgreement esmAgreement = esmAgreementService.selectByPk(order.getAgreeid());
+//        if (esmAgreement != null) {
+//            feeDetail.setAgreementcode(esmAgreement.getAgreementcode());
+//            feeDetail.setAgreetype(esmAgreement.getAgreementtype());
+//            feeDetail.setChannel(esmAgreement.getChannel());
+//        }
+//        feeDetail.setProducname(order.getProduct());
+//        feeDetail.setAuditstatus("0");  //0未审核 1已审核
+//
+//        insFeeDetailService.insert(feeDetail);
+//
+//        //机构费用
+//        InsDeptFee deptFee = new InsDeptFee();
+//        deptFee.setOrderno(order.getOrderno());
+//        deptFee.setQuoteno(order.getQuoteno());
+//        deptFee.setAgreeid(order.getAgreeid());
+//        deptFee.setAgreeprodid(order.getProductid());
+//        deptFee.setAuditstatus("0");
+//        deptFee.setSettlestatus("0");
+//        List<EsmAgreementProdfee> prodfees = esmAgreementProdfeeService.selectList(" where agreeprodid=?", new Object[]{order.getProductid()});
+//        for (EsmAgreementProdfee prodfee : prodfees) {
+//            deptFee.setKeeprate(prodfee.getKeeprate() * 0.01);
+//            BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getKeeprate() * 0.01);
+//            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//            deptFee.setKeepamount(amount.doubleValue());
+//            deptFee.setAddrate(prodfee.getAddrate() * 0.01);
+//            amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * prodfee.getAddrate() * 0.01);
+//            amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//            deptFee.setAddamount(amount.doubleValue());
+//            deptFee.setComlevel(prodfee.getComlevel());
+//            if ("一级".equals(prodfee.getComlevel())) {
+//                deptFee.setComcode(order.getDeptid().substring(0, 2));  //99140302M01D01
+//            } else if ("二级".equals(prodfee.getComlevel())) {
+//                deptFee.setComcode(order.getDeptid().substring(0, 4));
+//            } else if ("三级".equals(prodfee.getComlevel())) {
+//                deptFee.setComcode(order.getDeptid().substring(0, 6));
+//            } else if ("四级".equals(prodfee.getComlevel())) {
+//                deptFee.setComcode(order.getDeptid().substring(0, 8));
+//            } else {
+//                deptFee.setComcode(order.getDeptid().substring(0, 11));
+//            }
+//            insDeptFeeService.insert(deptFee);
+//        }
+//
+//        saveRetail(order); //分销所占比例
+//    }
 
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = Math.min(users.size(), 2);
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-            }
-        }
 
-        return retailRate;
-    }
+//    /**
+//     * 三级分销费用保存
+//     *
+//     * @param order
+//     * @return
+//     */
+//    public double saveRetail(InsOrder order) {
+//        double retailRate = 0;
+//
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{order.getDeptid(), "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(order.getUserid());
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                InsCommission commission = new InsCommission();
+//                commission.setOrderno(order.getOrderno());
+//                commission.setQuoteno(order.getQuoteno());
+//                commission.setRefereescode(users.get(0).getId());
+//                commission.setRefereesname(users.get(0).getName());
+//                double rate = rateList.get(0) * 0.01;
+//                commission.setCommissionrate(rate);
+//                BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                commission.setCommissionamount(amount.doubleValue());
+//                commission.setLevel("1");
+//                commission.setAuditstatus("0");  //0未审核 1已审核
+//                commission.setSettlestatus("0"); //0未结算 1已结算
+//                commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                insCommissionService.insert(commission);
+//
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    InsCommission commission = new InsCommission();
+//                    commission.setOrderno(order.getOrderno());
+//                    commission.setQuoteno(order.getQuoteno());
+//                    commission.setRefereescode(users.get(i).getId());
+//                    commission.setRefereesname(users.get(i).getName());
+//                    double rate = rateList.get(i) * 0.01;
+//                    commission.setCommissionrate(rate);
+//                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                    commission.setCommissionamount(amount.doubleValue());
+//                    commission.setLevel(String.valueOf(i + 1));
+//                    commission.setAuditstatus("0");  //0未审核 1已审核
+//                    commission.setSettlestatus("0"); //0未结算 1已结算
+//                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                    insCommissionService.insert(commission);
+//
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    InsCommission commission = new InsCommission();
+//                    commission.setOrderno(order.getOrderno());
+//                    commission.setQuoteno(order.getQuoteno());
+//                    commission.setRefereescode(users.get(i).getId());
+//                    commission.setRefereesname(users.get(i).getName());
+//                    double rate = rateList.get(i) * 0.01;
+//                    commission.setCommissionrate(rate);
+//                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                    amount = amount.setScale(2, RoundingMode.HALF_UP);
+//                    commission.setCommissionamount(amount.doubleValue());
+//                    commission.setLevel(String.valueOf(i + 1));
+//                    commission.setAuditstatus("0");  //0未审核 1已审核
+//                    commission.setSettlestatus("0"); //0未结算 1已结算
+//                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                    insCommissionService.insert(commission);
+//
+//                    retailRate += rateList.get(i);
+//                }
+//            }
+//        }
+//        return retailRate;
+//    }
+//
+//    /**
+//     * 分销费用统计
+//     *
+//     * @param deptid
+//     * @param userid
+//     * @return
+//     */
+//    public double countRetail(String deptid, String userid) {
+//        double retailRate = 0;
+//
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && !list.isEmpty() && !users.isEmpty() && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = Math.min(users.size(), 2);
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//            }
+//        }
+//
+//        return retailRate;
+//    }
 
     /**
      * 校验参数

src/main/java/com/ydtech/components/TokenInterceptor.java

@@ -21,7 +21,7 @@ public class TokenInterceptor {
         notMatchList.add("/login");
         notMatchList.add("/sendMsg");
         notMatchList.add("/loginByPhone");
-        notMatchList.add("/esmUserInternalcheck/userRegist");
+//        notMatchList.add("/esmUserInternalcheck/userRegist");
         notMatchList.add("/dict/**");   //字典
         notMatchList.add("/user/agentRegist");   //个代注册
         notMatchList.add("/template/**");   //系统模板

src/main/java/com/ydtech/modules/admin/controller/AppLoginController.java

@@ -8,12 +8,8 @@ import com.ydtech.modules.admin.model.SysCarousel;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysCarouselService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.convert.EsmUserInternalConvert;
 import com.ydtech.modules.esm.model.EsmOfferChannel;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.service.EsmOfferChannelService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
-import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,8 +33,6 @@ public class AppLoginController{
 //    @Autowired
 //    private SysUserCheckService sysUserCheckService;
 
-    @Autowired
-    private EsmUserInternalService esmUserInternalService;
 
     @Autowired
     private SysCarouselService sysCarouselService;
@@ -46,41 +40,41 @@ public class AppLoginController{
     @Autowired
     private EsmOfferChannelService esmOfferChannelService;
 
-    @PostMapping("/certification")
-    @ApiOperation("app端认证信息")
-    @Transactional
-    public HttpResult certification(@RequestBody EsmUserInternalVo record) {
-        if (StringUtils.isNullOrEmpty(record.getId())) {
-            return HttpResult.error("工号不能为空");
-        }
-
-        SysUser sysUser = sysUserService.getById(record.getId());
-        if(null == sysUser) return HttpResult.ok("系统用户不存在");
-        EsmUserInternal esmUserInternal = esmUserInternalService.getById(record.getId());
-
-        EsmUserInternal internal = EsmUserInternalConvert.INSTANCE.vo2Dto(record);
-        internal.setStatus("0");
-        internal.setIsteamleader("0");
-        // 查询申请不为空，就是修改
-        if (esmUserInternal != null) {
-            if (esmUserInternalService.updateById(internal)) {
-                return HttpResult.ok("修改成功");
-            }
-            return HttpResult.ok("修改失败");
-        }
-
-//        sysUser.setSex(record.getSex());
-        sysUser.setId(record.getId());
-        sysUser.setName(record.getName());
-        // 新注册的信息提交
-        boolean sysUserBoo = sysUserService.updateById(sysUser);
-        boolean integerBoo = esmUserInternalService.save(internal);
-
-        if (sysUserBoo && integerBoo) {
-            return HttpResult.ok("保存成功");
-        }
-        throw new SystemException("修改失败");
-    }
+//    @PostMapping("/certification")
+//    @ApiOperation("app端认证信息")
+//    @Transactional
+//    public HttpResult certification(@RequestBody EsmUserInternalVo record) {
+//        if (StringUtils.isNullOrEmpty(record.getId())) {
+//            return HttpResult.error("工号不能为空");
+//        }
+//
+//        SysUser sysUser = sysUserService.getById(record.getId());
+//        if(null == sysUser) return HttpResult.ok("系统用户不存在");
+//        EsmUserInternal esmUserInternal = esmUserInternalService.getById(record.getId());
+//
+//        EsmUserInternal internal = EsmUserInternalConvert.INSTANCE.vo2Dto(record);
+//        internal.setStatus("0");
+//        internal.setIsteamleader("0");
+//        // 查询申请不为空，就是修改
+//        if (esmUserInternal != null) {
+//            if (esmUserInternalService.updateById(internal)) {
+//                return HttpResult.ok("修改成功");
+//            }
+//            return HttpResult.ok("修改失败");
+//        }
+//
+////        sysUser.setSex(record.getSex());
+//        sysUser.setId(record.getId());
+//        sysUser.setName(record.getName());
+//        // 新注册的信息提交
+//        boolean sysUserBoo = sysUserService.updateById(sysUser);
+//        boolean integerBoo = esmUserInternalService.save(internal);
+//
+//        if (sysUserBoo && integerBoo) {
+//            return HttpResult.ok("保存成功");
+//        }
+//        throw new SystemException("修改失败");
+//    }
 
     @GetMapping("/getApplicationStatus")
     @ApiOperation("工号查询申请状态")
@@ -93,20 +87,20 @@ public class AppLoginController{
         return HttpResult.error("未提交认证信息");
     }
 
-    @GetMapping("/getApplicationInfo")
-    @ApiOperation("获取申请信息")
-    public HttpResult getApplicationInfo(String jobNumber) {
-        EsmUserInternal esmUserInternal = esmUserInternalService.getById(jobNumber);
-//        EsmUserInternalCheck esmUserInternalCheck = esmUserInternalCheckService.selectByPk(jobNumber);
-        if (esmUserInternal != null) {
-            EsmUserInternalVo esmUserInternalVo = EsmUserInternalConvert.INSTANCE.dto2Vo(esmUserInternal);
-            SysUser sysUser = sysUserService.getById(jobNumber);
-//            esmUserInternalVo.setSex(sysUser.getSex());
-            esmUserInternalVo.setName(sysUser.getName());
-            return HttpResult.ok("成功", esmUserInternalVo);
-        }
-        return HttpResult.error("未提交认证信息");
-    }
+//    @GetMapping("/getApplicationInfo")
+//    @ApiOperation("获取申请信息")
+//    public HttpResult getApplicationInfo(String jobNumber) {
+//        EsmUserInternal esmUserInternal = esmUserInternalService.getById(jobNumber);
+////        EsmUserInternalCheck esmUserInternalCheck = esmUserInternalCheckService.selectByPk(jobNumber);
+//        if (esmUserInternal != null) {
+//            EsmUserInternalVo esmUserInternalVo = EsmUserInternalConvert.INSTANCE.dto2Vo(esmUserInternal);
+//            SysUser sysUser = sysUserService.getById(jobNumber);
+////            esmUserInternalVo.setSex(sysUser.getSex());
+//            esmUserInternalVo.setName(sysUser.getName());
+//            return HttpResult.ok("成功", esmUserInternalVo);
+//        }
+//        return HttpResult.error("未提交认证信息");
+//    }
 
 
     @GetMapping("/getCarousel")

src/main/java/com/ydtech/modules/admin/controller/SysLoginController.java

@@ -7,7 +7,6 @@ import com.google.code.kaptcha.Producer;
 import com.ydtech.config.MasterPasswordConfig;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysMsgLogService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.admin.model.vo.LoginBean;
@@ -65,9 +64,6 @@ public class SysLoginController {
     @Autowired
     private StringRedisTemplate redisTemplate;
 
-    @Autowired
-    private EsmUserInternalService esmUserInternalService;
-
     @Autowired
     private MasterPasswordConfig masterPasswordConfig;
 

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -14,15 +14,15 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.*;
 import com.ydtech.modules.admin.model.dto.AgentUserDto;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.vo.SysReferrerVo;
+import com.ydtech.modules.admin.model.vo.SysUserVO;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
-import com.ydtech.modules.admin.model.vo.SysUserVO;
-import com.ydtech.modules.admin.vo.SysUserVo;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
 import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
@@ -38,7 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.validation.Valid;
 import java.io.IOException;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -59,8 +58,6 @@ public class SysUserController extends BaseController {
     @Autowired
     private SysUserService sysUserService;
     @Autowired
-    private EsmUserInternalService esmUserInternalService;
-    @Autowired
     private SysUserRoleService sysUserRoleService;
     @Autowired
     private SysDeptService sysDeptService;
@@ -446,7 +443,7 @@ public class SysUserController extends BaseController {
         //查询详情信息
         SysUserInfo userInfo = sysUserInfoService.getById(userId);
 
-        SysUserVo sysUserVo = new SysUserVo();
+        SysUser2Vo sysUserVo = new SysUser2Vo();
         sysUserVo.setSysUser(sysUser);
 
         sysUserVo.setSysUserInfo(userInfo);
@@ -547,18 +544,7 @@ public class SysUserController extends BaseController {
         sysUserRoleService.save(userRole);
 
 
-        //添加个代信息
-        EsmUserReferrer referrer = esmUserReferrerService.getById(dto.getReferrerId());
-        EsmUserReferrer eur = new EsmUserReferrer();
-        eur.setId(nextPK);
-        eur.setReferrerName(dto.getReferrerName());
-        eur.setReferrerId(dto.getReferrerId());
-        if (null != referrer) {
-            eur.setLevel(referrer.getLevel() + 1);
-        } else {
-            eur.setLevel(1);
-        }
-        esmUserReferrerService.save(eur);
+        esmUserReferrerService.addReferrer(dto.getReferrerId(),nextPK);
 
         return HttpResult.ok("保存成功", sysUser.getId());
     }
@@ -635,18 +621,13 @@ public class SysUserController extends BaseController {
     }
 
 
-    /**
-     * ==================用户详情=================
-     */
-
-
-    @ApiOperation(value = "保存或更新用户信息")
-    @PostMapping(value = "/saveOrUpdateInfo")
-    public HttpResult saveOrUpdateInfo(@RequestBody SysUserInfo sysUserInfo) {
-        if (StringUtils.isNullOrEmpty(sysUserInfo.getId())) return HttpResult.error("用户ID不能为空");
-        return HttpResult.ok(sysUserInfoService.saveOrUpdate(sysUserInfo));
-
-    }
+//    @ApiOperation(value = "保存或更新用户信息")
+//    @PostMapping(value = "/saveOrUpdateInfo")
+//    public HttpResult saveOrUpdateInfo(@RequestBody SysUserInfo sysUserInfo) {
+//        if (StringUtils.isNullOrEmpty(sysUserInfo.getId())) return HttpResult.error("用户ID不能为空");
+//        return HttpResult.ok(sysUserInfoService.saveOrUpdate(sysUserInfo));
+//
+//    }
 
 
     @GetMapping(value = "/findUserInfo/{userId}")
@@ -654,7 +635,7 @@ public class SysUserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户信息", required = true, dataType = "String")
     })
-    @SaCheckPermission("sys:menu:add")
+    //@SaCheckPermission("sys:menu:add")
     public HttpResult findUserInfo(@PathVariable String userId) {
         return HttpResult.ok(sysUserInfoService.getById(userId));
     }
@@ -662,7 +643,7 @@ public class SysUserController extends BaseController {
     @ApiOperation(value = "保存用户基本详情信息")
     @Transactional
     @PostMapping(value = "/saveUserInfo")
-    public HttpResult saveUserInfo(@RequestBody SysUserVo sysUserVo){
+    public HttpResult saveUserInfo(@RequestBody SysUser2Vo sysUserVo){
         return HttpResult.ok(sysUserService.saveUserInfo(sysUserVo)) ;
     }
 
@@ -670,10 +651,19 @@ public class SysUserController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "userId", value = "用户信息", required = true, dataType = "String")
     })
+
     @ApiOperation(value = "修改用户详情信息")
     @Transactional
-    public HttpResult updateUserInfo(@PathVariable String userId,@RequestBody SysUserVo sysUserVo) {
+    public HttpResult updateUserInfo(@PathVariable String userId,@RequestBody SysUser2Vo sysUserVo) {
         return HttpResult.ok(sysUserService.updateUserInfo(userId,sysUserVo));
     }
 
+
+    @ApiOperation(value = "获取推荐人分页信息")
+    @PostMapping(value = "/referrerFindPage")
+    public HttpResult<PageVo<SysReferrerVo>> referrerFindPage(@RequestBody PageDto<SysReferrerVo> pageDto) {
+        return HttpResult.ok(esmUserReferrerService.gainReferrerPage(pageDto));
+
+    }
+
 }

src/main/java/com/ydtech/modules/admin/model/dto/SysUserInfoDto.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.admin.model.dto;
 
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,8 +20,8 @@ public class SysUserInfoDto {
     @ApiModelProperty("基础用户")
     private SysUser sysUser;
 
-    @ApiModelProperty("用户详细信息")
-    private EsmUserInternal sysUserInternal;
+//    @ApiModelProperty("用户详细信息")
+//    private EsmUserInternal sysUserInternal;
 
 //    @ApiModelProperty("用户代理人信息")
 //    private EsmUserAgentCheck esmUserAgent;

src/main/java/com/ydtech/modules/admin/model/vo/SysReferrerVo.java

@@ -0,0 +1,49 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.SysUserInfo;
+import com.ydtech.modules.base.model.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("推荐人信息")
+public class SysReferrerVo {
+
+    @ApiModelProperty("机构ID")
+    private String orgId;
+
+    @ApiModelProperty("机构名称")
+    private String orgName;
+
+    @ApiModelProperty("部门ID")
+    private String deptId;
+
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
+    @ApiModelProperty("用户ID")
+    private String userId;
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
+    @ApiModelProperty("用户手机号")
+    private String userMobile;
+
+    @ApiModelProperty("用户性别")
+    private String userSex;
+
+    @ApiModelProperty("推荐人级别")
+    private String level;
+
+    @ApiModelProperty("推荐人归属用户ID")
+    private String affiliation;
+
+
+
+
+
+
+}

src/main/java/com/ydtech/modules/admin/vo/SysUserVo.java → src/main/java/com/ydtech/modules/admin/model/vo/SysUser2Vo.java

@@ -1,20 +1,15 @@
-package com.ydtech.modules.admin.vo;
+package com.ydtech.modules.admin.model.vo;
 
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserInfo;
-import com.ydtech.modules.admin.model.SysUserRole;
-import com.ydtech.modules.admin.model.dto.AgentUserDto;
 import com.ydtech.modules.base.model.BaseEntity;
-import com.ydtech.modules.esm.model.EsmUserReferrer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 @ApiModel("人员信息")
-public class SysUserVo extends BaseEntity {
+public class SysUser2Vo  {
     @ApiModelProperty("用户信息")
     private SysUser sysUser;
     @ApiModelProperty("用户详情信息")

src/main/java/com/ydtech/modules/admin/model/vo/SysUserInternalVO.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.admin.model.vo;
 
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,8 +19,8 @@ public class SysUserInternalVO {
 
     @ApiModelProperty("基础用户")
     private SysUser sysUser;
-    @ApiModelProperty("用户详细信息")
-    private EsmUserInternal sysUserInternal;
+//    @ApiModelProperty("用户详细信息")
+//    private EsmUserInternal sysUserInternal;
 //    private EsmUserAgentCheck esmUserAgent;
     @ApiModelProperty("部门")
     private SysDept sysDept;

src/main/java/com/ydtech/modules/admin/model/vo/SysUserSynthesisInfoVO.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.admin.model.vo;
 
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import lombok.Data;
 
 /**
@@ -16,7 +15,7 @@ public class SysUserSynthesisInfoVO {
 
 
     private SysUser sysUser;
-    private EsmUserInternal sysUserInternal;
+//    private EsmUserInternal sysUserInternal;
 //    private EsmUserAgentCheck esmUserAgent;
 
 

src/main/java/com/ydtech/modules/admin/model/vo/SysUserVO.java

@@ -106,4 +106,4 @@ public class SysUserVO {
     public void setStatus(String status) {
         this.status = status;
     }
-}
+}

src/main/java/com/ydtech/modules/admin/service/SysUserService.java

@@ -4,17 +4,15 @@ package com.ydtech.modules.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.model.SysUserInfo;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.model.dto.SysUserDto;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
-import com.ydtech.modules.admin.vo.SysUserVo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Set;
@@ -86,9 +84,9 @@ public interface SysUserService extends IService<SysUser> {
 
     boolean saveUser(SysUser sysUser);
 
-    HttpResult   saveUserInfo( SysUserVo sysUserVo);
+    HttpResult   saveUserInfo( SysUser2Vo sysUserVo);
 
-    HttpResult updateUserInfo(String userId,SysUserVo sysUserVo);
+    HttpResult updateUserInfo(String userId, SysUser2Vo sysUserVo);
 
 }
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -3,35 +3,27 @@ package com.ydtech.modules.admin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.model.*;
-import com.ydtech.modules.admin.model.dto.SysUserDto;
-import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserInternalVO;
 import com.ydtech.modules.admin.model.vo.SysUserVO;
-import com.ydtech.modules.admin.vo.SysUserVo;
+import com.ydtech.modules.admin.service.*;
+import com.ydtech.modules.admin.model.vo.SysUser2Vo;
 import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.vo.PageVo;
-import com.ydtech.modules.esm.model.EsmUserAgent;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
-import com.ydtech.modules.esm.service.EsmUserAgentService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.security.utils.PasswordUtils;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.idgen.IdGenerate;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.io.IOException;
-import java.io.Serializable;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -361,7 +353,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
     @Override
     @Transactional
-    public HttpResult saveUserInfo(SysUserVo sysUserVo) {
+    public HttpResult saveUserInfo(SysUser2Vo sysUserVo) {
 
         SysUser sysUser = sysUserVo.getSysUser();
         String userId = gainNextUserId(sysUser.getDeptId());
@@ -375,12 +367,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         sysUserRoleService.save(userRole);
 
         //推荐人
-        EsmUserReferrer eur = new EsmUserReferrer();
-        eur.setId(sysUser.getId());
-        eur.setReferrerName(sysUser.getReferrerName());
-        eur.setReferrerId(sysUser.getReferrerId());
-        eur.setLevel(1);
-        esmUserReferrerService.save(eur);
+        esmUserReferrerService.addReferrer(sysUser.getReferrerId(),sysUser.getId());
+//        EsmUserReferrer eur = new EsmUserReferrer();
+//        eur.setId(sysUser.getId());
+//        eur.setReferrerName(sysUser.getReferrerName());
+//        eur.setReferrerId(sysUser.getReferrerId());
+//        eur.setLevel(1);
+//
+//        esmUserReferrerService.save(eur);
 
         SysUserInfo userInfo = sysUserVo.getSysUserInfo();
         if (userInfo != null){
@@ -393,8 +387,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
     @Override
     @Transactional
-    public HttpResult updateUserInfo(String userId, SysUserVo sysUserVo) {
+    public HttpResult updateUserInfo(String userId, SysUser2Vo sysUserVo) {
         SysUser sysUser = sysUserVo.getSysUser();
+        //处理密码
+        if (StringUtils.isNotEmpty(sysUser.getPassword())) {
+            String salt = PasswordUtils.getSalt();
+            String pwd = PasswordUtils.encode(sysUser.getPassword(), salt);
+            sysUser.setPassword(pwd);
+            sysUser.setSalt(salt);
+        }
         updateById(sysUser);
 
         //角色配置
@@ -406,17 +407,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         sysUserRoleService.updateById(userRole);
 
         //推荐人
-        EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
-        EsmUserReferrer eur = new EsmUserReferrer();
-        eur.setId(userId);
-        eur.setReferrerName(sysUser.getReferrerName());
-        eur.setReferrerId(sysUser.getReferrerId());
-        if (null != referrer) {
-            eur.setLevel(referrer.getLevel() + 1);
-        } else {
-            eur.setLevel(1);
-        }
-        esmUserReferrerService.updateById(eur);
+        esmUserReferrerService.addReferrer(sysUser.getReferrerId(),userId);
+//        EsmUserReferrer referrer = esmUserReferrerService.getById(userId);
+//        EsmUserReferrer eur = new EsmUserReferrer();
+//        eur.setId(userId);
+//        eur.setReferrerName(sysUser.getReferrerName());
+//        eur.setReferrerId(sysUser.getReferrerId());
+//        if (null != referrer) {
+//            eur.setLevel(referrer.getLevel() + 1);
+//        } else {
+//            eur.setLevel(1);
+//        }
+//        esmUserReferrerService.updateById(eur);
 
         //用户详情信息
         SysUserInfo sysUserInfo = sysUserVo.getSysUserInfo();

src/main/java/com/ydtech/modules/admin/service/impl/WechatServiceImpl.java

@@ -14,7 +14,6 @@ import com.ydtech.modules.admin.model.vo.WechatBindPhoneVo;
 import com.ydtech.modules.admin.model.vo.WechatBindVo;
 import com.ydtech.modules.admin.model.vo.WechatLoginVo;
 import com.ydtech.modules.esm.model.SysUserCheck;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.service.SysUserCheckService;
 import com.ydtech.utils.idgen.IdGenerate;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +26,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import java.util.Date;
@@ -42,12 +42,11 @@ public class WechatServiceImpl implements WechatService {
 
     private final SysUserMapper sysUserMapper;
 
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
 
     private final WxMpService wxMpService;
 
-    private final EsmUserInternalService esmUserInternalService;
 
     private final SysUserRoleMapper sysUserRoleMapper;
 
@@ -55,13 +54,13 @@ public class WechatServiceImpl implements WechatService {
 
     private final SysUserCheckService sysUserCheckService;
 
-    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService,  SysUserRoleMapper sysUserRoleMapper, StringRedisTemplate stringRedisTemplate, EsmUserInternalService esmUserInternalService, SysUserCheckService sysUserCheckService) {
+    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService,  SysUserRoleMapper sysUserRoleMapper, StringRedisTemplate stringRedisTemplate, SysUserCheckService sysUserCheckService) {
         this.sysUserMapper = sysUserMapper;
         this.wxMpService = wxMpService;
 //        this.authenticationManager = authenticationManager;
         this.sysUserRoleMapper = sysUserRoleMapper;
         this.stringRedisTemplate = stringRedisTemplate;
-        this.esmUserInternalService = esmUserInternalService;
+//        this.esmUserInternalService = esmUserInternalService;
         this.sysUserCheckService = sysUserCheckService;
     }
 //    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService, AuthenticationManager authenticationManager, SysUserRoleMapper sysUserRoleMapper, StringRedisTemplate stringRedisTemplate, EsmUserInternalService esmUserInternalService, SysUserCheckService sysUserCheckService) {

src/main/java/com/ydtech/modules/demo/controller/DemoController.java

@@ -1,10 +1,14 @@
 package com.ydtech.modules.demo.controller;
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.dto.SysUserDto;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.base.model.dto.BaseDto;
+import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.base.model.dto.TestDto;
+import com.ydtech.modules.base.model.vo.PageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -90,10 +94,23 @@ public class DemoController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "ids", value = "ID数组", dataType = "String", paramType = "body", allowMultiple = true, required = true)
     })
-    public HttpResult pay(@RequestBody List<String> ids) {
+    public HttpResult demo06(@RequestBody List<String> ids) {
         //业务代码
         return HttpResult.ok(ids);
     }
 
 
+    @PostMapping(value = "/demo07")
+    @ApiOperation(value = "post请求，分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ids", value = "ID数组", dataType = "String", paramType = "body", allowMultiple = true, required = true)
+    })
+    public HttpResult<PageVo<SysUserBaseVO>> demo07(@RequestBody PageDto<SysUserDto> pageDto) {
+        //业务代码
+        PageVo<SysUserBaseVO> pageVo = new PageVo();
+        return HttpResult.ok(pageVo);
+//        return HttpResult.ok(sysUserService.gainUserPage(pageDto));
+    }
+
+
 }

src/main/java/com/ydtech/modules/esm/convert/EsmUserInternalCheckConvert.java

@@ -1,7 +1,5 @@
 package com.ydtech.modules.esm.convert;
 
-import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
@@ -10,8 +8,8 @@ public interface EsmUserInternalCheckConvert {
 
     EsmUserInternalCheckConvert INSTANCE = Mappers.getMapper(EsmUserInternalCheckConvert.class);
 
-    EsmUserInternalCheck vo2Dto(EsmUserInternalVo esmUserInternalVo);
-
-    EsmUserInternalVo dto2Vo(EsmUserInternalCheck esmUserInternal);
+//    EsmUserInternalCheck vo2Dto(EsmUserInternalVo esmUserInternalVo);
+//
+//    EsmUserInternalVo dto2Vo(EsmUserInternalCheck esmUserInternal);
 
 }

src/main/java/com/ydtech/modules/esm/convert/EsmUserInternalConvert.java

@@ -1,17 +1,17 @@
-package com.ydtech.modules.esm.convert;
-
-import com.ydtech.modules.esm.model.EsmUserInternal;
-import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
-import org.mapstruct.Mapper;
-import org.mapstruct.factory.Mappers;
-
-@Mapper
-public interface EsmUserInternalConvert {
-
-    EsmUserInternalConvert INSTANCE = Mappers.getMapper(EsmUserInternalConvert.class);
-
-    EsmUserInternal vo2Dto(EsmUserInternalVo esmUserInternalVo);
-
-    EsmUserInternalVo dto2Vo(EsmUserInternal esmUserInternal);
-
-}
+//package com.ydtech.modules.esm.convert;
+//
+//import com.ydtech.modules.esm.model.EsmUserInternal;
+//import com.ydtech.modules.esm.model.vo.EsmUserInternalVo;
+//import org.mapstruct.Mapper;
+//import org.mapstruct.factory.Mappers;
+//
+//@Mapper
+//public interface EsmUserInternalConvert {
+//
+//    EsmUserInternalConvert INSTANCE = Mappers.getMapper(EsmUserInternalConvert.class);
+//
+//    EsmUserInternal vo2Dto(EsmUserInternalVo esmUserInternalVo);
+//
+//    EsmUserInternalVo dto2Vo(EsmUserInternal esmUserInternal);
+//
+//}

src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalCheckDao.java

@@ -1,37 +1,37 @@
-package com.ydtech.modules.esm.dao;
-
-import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-import com.ydtech.core.page.PageResult;
-
-import java.util.List;
-
-import java.util.Date;
-
-
-public interface EsmUserInternalCheckDao {
-
-
-    public EsmUserInternalCheck selectByPk(String id);
-
-    public List<EsmUserInternalCheck> selectAll();
-
-    public List<EsmUserInternalCheck> selectList(String whereCase, Object[] paramValues);
-
-    public Integer count(String whereCase, Object[] paramValues);
-
-    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-
-    public Integer insert(EsmUserInternalCheck model);
-
-
-    public Integer insertSelective(EsmUserInternalCheck model);
-
-    public Integer update(EsmUserInternalCheck model);
-
-    public Integer updateSelective(EsmUserInternalCheck model);
-
-    public Integer delete(String id);
-
-    public Integer delete(List<EsmUserInternalCheck> lsEsmUserInternalCheck);
-
-}
+//package com.ydtech.modules.esm.dao;
+//
+//import com.ydtech.modules.esm.model.EsmUserInternalCheck;
+//import com.ydtech.core.page.PageResult;
+//
+//import java.util.List;
+//
+//import java.util.Date;
+//
+//
+//public interface EsmUserInternalCheckDao {
+//
+//
+//    public EsmUserInternalCheck selectByPk(String id);
+//
+//    public List<EsmUserInternalCheck> selectAll();
+//
+//    public List<EsmUserInternalCheck> selectList(String whereCase, Object[] paramValues);
+//
+//    public Integer count(String whereCase, Object[] paramValues);
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
+//
+//    public Integer insert(EsmUserInternalCheck model);
+//
+//
+//    public Integer insertSelective(EsmUserInternalCheck model);
+//
+//    public Integer update(EsmUserInternalCheck model);
+//
+//    public Integer updateSelective(EsmUserInternalCheck model);
+//
+//    public Integer delete(String id);
+//
+//    public Integer delete(List<EsmUserInternalCheck> lsEsmUserInternalCheck);
+//
+//}

src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalDao.java

@@ -1,37 +1,37 @@
-package com.ydtech.modules.esm.dao;
-
-import com.ydtech.modules.esm.model.EsmUserInternal;
-import com.ydtech.core.page.PageResult;
-
-import java.util.List;
-
-import java.util.Date;
-
-
-public interface EsmUserInternalDao {
-
-
-    public EsmUserInternal selectByPk(String id);
-
-    public List<EsmUserInternal> selectAll();
-
-    public List<EsmUserInternal> selectList(String whereCase, Object[] paramValues);
-
-    public Integer count(String whereCase, Object[] paramValues);
-
-    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-
-    public Integer insert(EsmUserInternal model);
-
-
-    public Integer insertSelective(EsmUserInternal model);
-
-    public Integer update(EsmUserInternal model);
-
-    public Integer updateSelective(EsmUserInternal model);
-
-    public Integer delete(String id);
-
-    public Integer delete(List<EsmUserInternal> lsEsmUserInternal);
-
-}
+//package com.ydtech.modules.esm.dao;
+//
+//import com.ydtech.modules.esm.model.EsmUserInternal;
+//import com.ydtech.core.page.PageResult;
+//
+//import java.util.List;
+//
+//import java.util.Date;
+//
+//
+//public interface EsmUserInternalDao {
+//
+//
+//    public EsmUserInternal selectByPk(String id);
+//
+//    public List<EsmUserInternal> selectAll();
+//
+//    public List<EsmUserInternal> selectList(String whereCase, Object[] paramValues);
+//
+//    public Integer count(String whereCase, Object[] paramValues);
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
+//
+//    public Integer insert(EsmUserInternal model);
+//
+//
+//    public Integer insertSelective(EsmUserInternal model);
+//
+//    public Integer update(EsmUserInternal model);
+//
+//    public Integer updateSelective(EsmUserInternal model);
+//
+//    public Integer delete(String id);
+//
+//    public Integer delete(List<EsmUserInternal> lsEsmUserInternal);
+//
+//}

src/main/java/com/ydtech/modules/esm/dao/EsmUserInternalMapper.java

@@ -1,101 +1,101 @@
-package com.ydtech.modules.esm.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.esm.model.EsmUserInternal;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface EsmUserInternalMapper extends BaseMapper<EsmUserInternal> {
-
-//    String internalUserSql = "select t.id,t.name,t.dept_id deptid,t2.name deptname,t3.id comid,t3.name comname,t.status " +
-//            "from sys_user t left join sys_dept t2 on t.dept_id=t2.id " +
-//            "left join sys_dept t3 on t2.parent_id=t3.id " +
-//            "left join esm_user_internal a on t.id=a.id " +
-//            "where t.id=#{userId}";
-//
-//    String internalUserByDeptIdSql = "select t1.id,t1.name,t1.dept_id deptid,sd.name deptname,sd2.id comid,sd2.name comname,t2.status " +
-//            "from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " +
-//            "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " +
-//            "LEFT JOIN sys_dept sd2 ON sd2.id=sd.parent_id " +
-//            "where 1=1  and t2.isteamleader = '1' and t1.dept_id=#{deptId}";
-//
-//
-//    String selectUserParamSql = "select su.id as userId,su.name,su.sex,su.mobile,su.status\n" +
-//            ",sd.id as deptId,sd.name as deptName\n" +
-//            ",psd.id as pDeptId,psd.name as pDeptName\n" +
-//            ",dict.label as jobName\n" +
-//            ",dict2.label as approvalStatus";
-//
-//
-//    String selectUserFromSql = " from sys_user su \n" +
-//            "left JOIN sys_dept sd on su.dept_id=sd.id\n" +
-//            "left join sys_dept psd on sd.parent_id=psd.id\n" +
-//            "left join sys_dict dict on dict.value=su.job_code\n" +
-//            "left join sys_dict dict2 on dict2.value=su.approval_status\n" +
-//            "where 1=1\n" +
-//            "and sd.id &lt;&gt; '' \n" +
-//            "AND dict.itemname = 'jobcode'\n" +
-//            "AND dict2.itemname = 'approval'";
-//
-//    String selectUserFromWhereSql = " " +
-//            "<if test='page.columnFilters.usertype !=null and page.columnFilters.usertype.value!=\"\" and page.columnFilters.usertype.value!=null '>" +
-//            "  and su.usertype = #{page.columnFilters.usertype.value}" +
-//            "</if> " +
-//            "<if test='page.columnFilters.approvalStatus !=null and page.columnFilters.approvalStatus.value!=\"\" and page.columnFilters.approvalStatus.value!=null '>" +
-//            " and su.approval_status = #{page.columnFilters.approvalStatus.value}" +
-//            "</if> " +
-//            "<if test='page.columnFilters.realName !=null and page.columnFilters.realName.value!=\"\" and page.columnFilters.realName.value!=null '> " +
-//            " and su.name like concat('%',#{page.columnFilters.realName.value},'%')" +
-//            "</if> " +
-//            "<if test='page.columnFilters.userId !=null and page.columnFilters.userId.value!=\"\" and page.columnFilters.userId.value!=null '>" +
-//            " and su.id = #{page.columnFilters.userId.value}" +
-//            "</if> " +
-//            "<if test='page.columnFilters.mobile !=null and page.columnFilters.mobile.value!=\"\" and page.columnFilters.mobile.value!=null '>" +
-//            " and su.mobile = #{page.columnFilters.mobile.value}" +
-//            "</if> " +
-//            "<if test='page.columnFilters.delFlag !=null and page.columnFilters.delFlag.value!=\"\" and page.columnFilters.delFlag.value!=null '>" +
-//            " and su.del_flag = #{page.columnFilters.delFlag.value}" +
-//            "</if> " +
-//            "<if test='page.columnFilters.deptId !=null and page.columnFilters.deptId.value!=\"\" and page.columnFilters.deptId.value!=null '>" +
-//            " and su.dept_id like concat('%',#{page.columnFilters.deptId.value},'%')" +
-//            "</if> " +
-//            "";
-//
-//
+//package com.ydtech.modules.esm.dao;
+//
+//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+//import com.ydtech.modules.esm.model.EsmUserInternal;
+//import org.springframework.stereotype.Repository;
+//
+//@Repository
+//public interface EsmUserInternalMapper extends BaseMapper<EsmUserInternal> {
+//
+////    String internalUserSql = "select t.id,t.name,t.dept_id deptid,t2.name deptname,t3.id comid,t3.name comname,t.status " +
+////            "from sys_user t left join sys_dept t2 on t.dept_id=t2.id " +
+////            "left join sys_dept t3 on t2.parent_id=t3.id " +
+////            "left join esm_user_internal a on t.id=a.id " +
+////            "where t.id=#{userId}";
+////
+////    String internalUserByDeptIdSql = "select t1.id,t1.name,t1.dept_id deptid,sd.name deptname,sd2.id comid,sd2.name comname,t2.status " +
+////            "from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " +
+////            "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " +
+////            "LEFT JOIN sys_dept sd2 ON sd2.id=sd.parent_id " +
+////            "where 1=1  and t2.isteamleader = '1' and t1.dept_id=#{deptId}";
+////
+////
+////    String selectUserParamSql = "select su.id as userId,su.name,su.sex,su.mobile,su.status\n" +
+////            ",sd.id as deptId,sd.name as deptName\n" +
+////            ",psd.id as pDeptId,psd.name as pDeptName\n" +
+////            ",dict.label as jobName\n" +
+////            ",dict2.label as approvalStatus";
+////
+////
+////    String selectUserFromSql = " from sys_user su \n" +
+////            "left JOIN sys_dept sd on su.dept_id=sd.id\n" +
+////            "left join sys_dept psd on sd.parent_id=psd.id\n" +
+////            "left join sys_dict dict on dict.value=su.job_code\n" +
+////            "left join sys_dict dict2 on dict2.value=su.approval_status\n" +
+////            "where 1=1\n" +
+////            "and sd.id &lt;&gt; '' \n" +
+////            "AND dict.itemname = 'jobcode'\n" +
+////            "AND dict2.itemname = 'approval'";
+////
 ////    String selectUserFromWhereSql = " " +
-////            " and su.usertype = #{page.columnFilters.usertype.value}" +
-////            " and su.status = #{page.columnFilters.status.value}" +
-////            " and su.name like concat('%',#{page.columnFilters.name.value},'%')" +
+////            "<if test='page.columnFilters.usertype !=null and page.columnFilters.usertype.value!=\"\" and page.columnFilters.usertype.value!=null '>" +
+////            "  and su.usertype = #{page.columnFilters.usertype.value}" +
+////            "</if> " +
+////            "<if test='page.columnFilters.approvalStatus !=null and page.columnFilters.approvalStatus.value!=\"\" and page.columnFilters.approvalStatus.value!=null '>" +
+////            " and su.approval_status = #{page.columnFilters.approvalStatus.value}" +
+////            "</if> " +
+////            "<if test='page.columnFilters.realName !=null and page.columnFilters.realName.value!=\"\" and page.columnFilters.realName.value!=null '> " +
+////            " and su.name like concat('%',#{page.columnFilters.realName.value},'%')" +
+////            "</if> " +
+////            "<if test='page.columnFilters.userId !=null and page.columnFilters.userId.value!=\"\" and page.columnFilters.userId.value!=null '>" +
 ////            " and su.id = #{page.columnFilters.userId.value}" +
+////            "</if> " +
+////            "<if test='page.columnFilters.mobile !=null and page.columnFilters.mobile.value!=\"\" and page.columnFilters.mobile.value!=null '>" +
 ////            " and su.mobile = #{page.columnFilters.mobile.value}" +
+////            "</if> " +
+////            "<if test='page.columnFilters.delFlag !=null and page.columnFilters.delFlag.value!=\"\" and page.columnFilters.delFlag.value!=null '>" +
+////            " and su.del_flag = #{page.columnFilters.delFlag.value}" +
+////            "</if> " +
+////            "<if test='page.columnFilters.deptId !=null and page.columnFilters.deptId.value!=\"\" and page.columnFilters.deptId.value!=null '>" +
+////            " and su.dept_id like concat('%',#{page.columnFilters.deptId.value},'%')" +
+////            "</if> " +
 ////            "";
+////
+////
+//////    String selectUserFromWhereSql = " " +
+//////            " and su.usertype = #{page.columnFilters.usertype.value}" +
+//////            " and su.status = #{page.columnFilters.status.value}" +
+//////            " and su.name like concat('%',#{page.columnFilters.name.value},'%')" +
+//////            " and su.id = #{page.columnFilters.userId.value}" +
+//////            " and su.mobile = #{page.columnFilters.mobile.value}" +
+//////            "";
+////
+////
+////    @Select(internalUserSql)
+////    SysUserVO gainInternalUser(@Param("userId") String userId);
+////
+////
+////    @Select(internalUserByDeptIdSql)
+////    SysUserVO gainInternalUserByDeptId(@Param("deptId") String deptId);
+////
+////
+////    //    @Select("select * from (" + selectUserParamSql + selectUserFromSql + selectUserFromWhereSql + " limit #{page.pageNum},#{page.pageSize} ) aaa")
+////    @Select({"<script>",
+////            "select * from (",
+////            selectUserParamSql,
+////            selectUserFromSql,
+////            selectUserFromWhereSql,
+////            " limit #{page.pageNum},#{page.pageSize} ) aaa",
+////            "</script>"})
+////    List<SysUserBaseVO> gainUserBaseInfo(@Param("page") PageRequest pageRequest);
+////
+////
+////    //    @Select("select count(1) " + selectUserFromSql + selectUserFromWhereSql)
+////    @Select({"<script>","select count(1) ",selectUserFromSql,selectUserFromWhereSql,"</script>"})
+////    int gainUserBaseInfoCount(@Param("page") PageRequest pageRequest);
+//
+//}
 //
 //
-//    @Select(internalUserSql)
-//    SysUserVO gainInternalUser(@Param("userId") String userId);
-//
-//
-//    @Select(internalUserByDeptIdSql)
-//    SysUserVO gainInternalUserByDeptId(@Param("deptId") String deptId);
-//
-//
-//    //    @Select("select * from (" + selectUserParamSql + selectUserFromSql + selectUserFromWhereSql + " limit #{page.pageNum},#{page.pageSize} ) aaa")
-//    @Select({"<script>",
-//            "select * from (",
-//            selectUserParamSql,
-//            selectUserFromSql,
-//            selectUserFromWhereSql,
-//            " limit #{page.pageNum},#{page.pageSize} ) aaa",
-//            "</script>"})
-//    List<SysUserBaseVO> gainUserBaseInfo(@Param("page") PageRequest pageRequest);
 //
 //
-//    //    @Select("select count(1) " + selectUserFromSql + selectUserFromWhereSql)
-//    @Select({"<script>","select count(1) ",selectUserFromSql,selectUserFromWhereSql,"</script>"})
-//    int gainUserBaseInfoCount(@Param("page") PageRequest pageRequest);
-
-}
-
-
-
-

src/main/java/com/ydtech/modules/esm/dao/EsmUserReferrerMapper.java

@@ -1,13 +1,77 @@
 package com.ydtech.modules.esm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.vo.SysReferrerVo;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
+import com.ydtech.modules.base.model.dto.PageDto;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 @Repository
 public interface EsmUserReferrerMapper extends BaseMapper<EsmUserReferrer> {
 
+    String referrerFieldSql = "select " +
+            " org.id as orgId" +
+            ",org.name as orgName" +
+            ",d.name as deptName" +
+            ",d.id as deptId" +
+            ",u.id as userId" +
+            ",u.name as userName" +
+            ",u.mobile as userMobile" +
+            ",ui.sex  as userSex" +
+            ",t.level  as level" +
+            ",t.affiliation"
+            ;
+
+    String referrerFromSql =
+            "   from esm_user_referrer t " +
+            "	left join sys_user u on t.id = u.id" +
+            "	left join sys_user_info ui on u.id = ui.id" +
+            "	left join (select name,id from sys_dept where inSTR(id,'D')) d on d.id = u.dept_id" +
+            "	left join (select name,id from sys_dept where !inSTR(id,'D')) org on org.id = substring_index(u.dept_id,'D',1)" +
+            "	where 1=1 "
+            ;
+
+    String referrerWhereSql = "" +
+            "<if test='page.dto !=null  '> " +
+                    "<if test='page.dto.affiliation !=null and page.dto.affiliation!=\"\" '> " +
+                    " and t.affiliation = #{page.dto.affiliation}" +
+                    "</if> " +
+            "</if> "
+            ;
+    String referrerOrderSql = "" +
+            " ORDER BY t.level "
+            ;
+
+
+
+
+
+
+
+
+
+//    String referrerSql = "select org.id as orgId,org.name as orgName,d.name as deptName,d.id as deptId,u.id,u.name,u.mobile,ui.sex ,t.affiliation" +
+//            " from esm_user_referrer t " +
+//            "	left join sys_user u on t.id = u.id" +
+//            "	left join sys_user_info ui on u.id = ui.id" +
+//            "	left join (select name,id from sys_dept where inSTR(id,'D')) d on d.id = u.dept_id" +
+//            "	left join (select name,id from sys_dept where !inSTR(id,'D')) org on org.id = substring_index(u.dept_id,'D',1)" +
+//            "	where t.affiliation=#{affiliation} "
+//            ;
+
+    @Select({"<script>", referrerFieldSql, referrerFromSql,referrerWhereSql,referrerOrderSql, "</script>"})
+    List<SysReferrerVo> selectReferrerByAffiliation(@Param("page") PageDto pageDto);
+
+
+    @Select({"<script>", "select count(1) ", referrerFromSql,referrerWhereSql, "</script>"})
+    int countReferrerByAffiliation(@Param("page") PageDto pageDto);
+
 
 
 }

src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserInternalCheckDaoImpl.java

@@ -1,664 +1,664 @@
-package com.ydtech.modules.esm.dao.impl;
-
-import com.ydtech.modules.esm.dao.EsmUserInternalCheckDao;
-import com.ydtech.modules.esm.model.EsmUserInternalCheck;
-import com.ydtech.core.page.PageResult;
-import com.github.drinkjava2.jdialects.Dialect;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementCreator;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-
-
-@Repository
-public class EsmUserInternalCheckDaoImpl implements EsmUserInternalCheckDao {
-
-    @Autowired
-    public DataSource dataSource;
-
-
-    public static class EsmUserInternalCheckRowMapper implements RowMapper {
-        public EsmUserInternalCheck mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-            EsmUserInternalCheck model = new EsmUserInternalCheck();
-
-            model.setCheckid(resultSet.getString("checkid"));
-            model.setId(resultSet.getString("id"));
-            model.setAddressnow(resultSet.getString("addressnow"));
-            model.setNations(resultSet.getString("nations"));
-            model.setPoliticalstatus(resultSet.getString("politicalstatus"));
-            model.setCollege(resultSet.getString("college"));
-            model.setIdentity(resultSet.getString("identity"));
-            model.setEducation(resultSet.getString("education"));
-            model.setBankname(resultSet.getString("bankname"));
-            model.setAccountno(resultSet.getString("accountno"));
-            model.setAddressresident(resultSet.getString("addressresident"));
-            model.setHealth(resultSet.getString("health"));
-            model.setPostalcode(resultSet.getString("postalcode"));
-            model.setPhonehouse(resultSet.getString("phonehouse"));
-            model.setCollegetm(resultSet.getDate("collegetm"));
-            model.setSpeciality(resultSet.getString("speciality"));
-            model.setNativeplace(resultSet.getString("nativeplace"));
-            model.setWorktype(resultSet.getString("worktype"));
-            model.setBlood(resultSet.getString("blood"));
-            model.setSaleno(resultSet.getString("saleno"));
-            model.setOrglast(resultSet.getString("orglast"));
-            model.setJoblast(resultSet.getString("joblast"));
-            model.setHobby(resultSet.getString("hobby"));
-            model.setNamespecial(resultSet.getString("namespecial"));
-            model.setPhonespecial(resultSet.getString("phonespecial"));
-            model.setIntimes(resultSet.getString("intimes"));
-            model.setContracttime(resultSet.getDate("contracttime"));
-            model.setIsteamleader(resultSet.getString("isteamleader"));
-            model.setDocumentno(resultSet.getString("documentno"));
-            model.setHrcode(resultSet.getString("hrcode"));
-            model.setRegulartm(resultSet.getDate("regulartm"));
-            model.setIntime(resultSet.getDate("intime"));
-            model.setSalarycode(resultSet.getString("salarycode"));
-            model.setBirthday(resultSet.getDate("birthday"));
-            model.setMarrycode(resultSet.getString("marrycode"));
-            model.setStatus(resultSet.getString("status"));
-            model.setWhichteam(resultSet.getString("whichteam"));
-            model.setRemark(resultSet.getString("remark"));
-
-            return model;
-        }
-    }
-
-
-    @Override
-    public EsmUserInternalCheck selectByPk(String id) {
-        String sql = " select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  where checkid=? or id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        List<EsmUserInternalCheck> ls = jdbcTemplate.query(sql, new Object[]{id, id}, new EsmUserInternalCheckRowMapper());
-
-        if (ls != null && ls.size() > 0) {
-            return ls.get(0);
-        }
-
-        return null;
-    }
-
-
-    @Override
-    public List<EsmUserInternalCheck> selectAll() {
-        String sql = "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.query(sql, new EsmUserInternalCheckRowMapper());
-    }
-
-
-    public List<EsmUserInternalCheck> selectList(String whereCase, Object[] paramValues) {
-        String sql = "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  " + whereCase;
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.query(sql, paramValues, new EsmUserInternalCheckRowMapper());
-    }
-
-
-    public Integer count(String whereCase, Object[] paramValues) {
-        String sql = "select count(1) from esm_user_internal_check t " + whereCase;
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-    }
-
-
-    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-
-        Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  " + whereCase);
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        List<EsmUserInternalCheck> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserInternalCheckRowMapper());
-
-        int totalCount = count(whereCase, paramValues);
-
-        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-
-        return pageResult;
-    }
-
-
-    @Override
-    public Integer insert(EsmUserInternalCheck model) {
-
-        String sql = "insert into esm_user_internal_check (checkid, id, addressnow, nations, politicalstatus, college, identity, education, bankname, accountno, addressresident, health, postalcode, phonehouse, collegetm, speciality, nativeplace, worktype, blood, saleno, orglast, joblast, hobby, namespecial, phonespecial, intimes, contracttime, isteamleader, documentno, hrcode, regulartm, intime, salarycode, birthday, marrycode, status, whichteam, remark) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = new Object[]{model.getCheckid(), model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark()};
-
-        int out = jdbcTemplate.update(sql, params);
-
-        return out;
-    }
-
-
-    @Override
-    public Integer insertSelective(EsmUserInternalCheck model) {
-
-        StringBuffer sbSql = new StringBuffer();
-        StringBuffer sbParams = new StringBuffer();
-        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-
-        String pre = "";
-
-        if (model.getCheckid() != null) {
-            sbSql.append(pre + "checkid");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCheckid());
-            pre = ",";
-        }
-        if (model.getId() != null) {
-            sbSql.append(pre + "id");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getId());
-            pre = ",";
-        }
-        if (model.getAddressnow() != null) {
-            sbSql.append(pre + "addressnow");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getAddressnow());
-            pre = ",";
-        }
-        if (model.getNations() != null) {
-            sbSql.append(pre + "nations");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getNations());
-            pre = ",";
-        }
-        if (model.getPoliticalstatus() != null) {
-            sbSql.append(pre + "politicalstatus");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPoliticalstatus());
-            pre = ",";
-        }
-        if (model.getCollege() != null) {
-            sbSql.append(pre + "college");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCollege());
-            pre = ",";
-        }
-        if (model.getIdentity() != null) {
-            sbSql.append(pre + "identity");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIdentity());
-            pre = ",";
-        }
-        if (model.getEducation() != null) {
-            sbSql.append(pre + "education");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getEducation());
-            pre = ",";
-        }
-        if (model.getBankname() != null) {
-            sbSql.append(pre + "bankname");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getBankname());
-            pre = ",";
-        }
-        if (model.getAccountno() != null) {
-            sbSql.append(pre + "accountno");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getAccountno());
-            pre = ",";
-        }
-        if (model.getAddressresident() != null) {
-            sbSql.append(pre + "addressresident");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getAddressresident());
-            pre = ",";
-        }
-        if (model.getHealth() != null) {
-            sbSql.append(pre + "health");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getHealth());
-            pre = ",";
-        }
-        if (model.getPostalcode() != null) {
-            sbSql.append(pre + "postalcode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPostalcode());
-            pre = ",";
-        }
-        if (model.getPhonehouse() != null) {
-            sbSql.append(pre + "phonehouse");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPhonehouse());
-            pre = ",";
-        }
-        if (model.getCollegetm() != null) {
-            sbSql.append(pre + "collegetm");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCollegetm());
-            pre = ",";
-        }
-        if (model.getSpeciality() != null) {
-            sbSql.append(pre + "speciality");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getSpeciality());
-            pre = ",";
-        }
-        if (model.getNativeplace() != null) {
-            sbSql.append(pre + "nativeplace");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getNativeplace());
-            pre = ",";
-        }
-        if (model.getWorktype() != null) {
-            sbSql.append(pre + "worktype");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getWorktype());
-            pre = ",";
-        }
-        if (model.getBlood() != null) {
-            sbSql.append(pre + "blood");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getBlood());
-            pre = ",";
-        }
-        if (model.getSaleno() != null) {
-            sbSql.append(pre + "saleno");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getSaleno());
-            pre = ",";
-        }
-        if (model.getOrglast() != null) {
-            sbSql.append(pre + "orglast");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getOrglast());
-            pre = ",";
-        }
-        if (model.getJoblast() != null) {
-            sbSql.append(pre + "joblast");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getJoblast());
-            pre = ",";
-        }
-        if (model.getHobby() != null) {
-            sbSql.append(pre + "hobby");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getHobby());
-            pre = ",";
-        }
-        if (model.getNamespecial() != null) {
-            sbSql.append(pre + "namespecial");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getNamespecial());
-            pre = ",";
-        }
-        if (model.getPhonespecial() != null) {
-            sbSql.append(pre + "phonespecial");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPhonespecial());
-            pre = ",";
-        }
-        if (model.getIntimes() != null) {
-            sbSql.append(pre + "intimes");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIntimes());
-            pre = ",";
-        }
-        if (model.getContracttime() != null) {
-            sbSql.append(pre + "contracttime");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getContracttime());
-            pre = ",";
-        }
-        if (model.getIsteamleader() != null) {
-            sbSql.append(pre + "isteamleader");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIsteamleader());
-            pre = ",";
-        }
-        if (model.getDocumentno() != null) {
-            sbSql.append(pre + "documentno");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getDocumentno());
-            pre = ",";
-        }
-        if (model.getHrcode() != null) {
-            sbSql.append(pre + "hrcode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getHrcode());
-            pre = ",";
-        }
-        if (model.getRegulartm() != null) {
-            sbSql.append(pre + "regulartm");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getRegulartm());
-            pre = ",";
-        }
-        if (model.getIntime() != null) {
-            sbSql.append(pre + "intime");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIntime());
-            pre = ",";
-        }
-        if (model.getSalarycode() != null) {
-            sbSql.append(pre + "salarycode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getSalarycode());
-            pre = ",";
-        }
-        if (model.getBirthday() != null) {
-            sbSql.append(pre + "birthday");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getBirthday());
-            pre = ",";
-        }
-        if (model.getMarrycode() != null) {
-            sbSql.append(pre + "marrycode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getMarrycode());
-            pre = ",";
-        }
-        if (model.getStatus() != null) {
-            sbSql.append(pre + "status");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getStatus());
-            pre = ",";
-        }
-        if (model.getWhichteam() != null) {
-            sbSql.append(pre + "whichteam");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getWhichteam());
-            pre = ",";
-        }
-        if (model.getRemark() != null) {
-            sbSql.append(pre + "remark");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getRemark());
-            pre = ",";
-        }
-
-
-        String sql = "INSERT INTO esm_user_internal_check (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = alParamsValues.toArray();
-
-        int out = jdbcTemplate.update(sql, params);
-
-        return out;
-    }
-
-
-    @Override
-    public Integer update(EsmUserInternalCheck model) {
-
-        String sql = "update esm_user_internal_check set id=?, addressnow=?, nations=?, politicalstatus=?, college=?, identity=?, education=?, bankname=?, accountno=?, addressresident=?, health=?, postalcode=?, phonehouse=?, collegetm=?, speciality=?, nativeplace=?, worktype=?, blood=?, saleno=?, orglast=?, joblast=?, hobby=?, namespecial=?, phonespecial=?, intimes=?, contracttime=?, isteamleader=?, documentno=?, hrcode=?, regulartm=?, intime=?, salarycode=?, birthday=?, marrycode=?, status=?, whichteam=?, remark=? where checkid=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = new Object[]{model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark(), model.getCheckid()};
-
-        return jdbcTemplate.update(sql, params);
-    }
-
-
-    @Override
-    public Integer updateSelective(EsmUserInternalCheck model) {
-
-        StringBuffer sbSql = new StringBuffer();
-        StringBuffer sbParams = new StringBuffer();
-        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-
-        String pre = "";
-        String preWhere = "";
-
-        if (model.getAddressnow() != null) {
-            sbSql.append(pre + "addressnow=?");
-            alParamsValues.add(model.getAddressnow());
-            pre = ",";
-        }
-        if (model.getNations() != null) {
-            sbSql.append(pre + "nations=?");
-            alParamsValues.add(model.getNations());
-            pre = ",";
-        }
-        if (model.getPoliticalstatus() != null) {
-            sbSql.append(pre + "politicalstatus=?");
-            alParamsValues.add(model.getPoliticalstatus());
-            pre = ",";
-        }
-        if (model.getCollege() != null) {
-            sbSql.append(pre + "college=?");
-            alParamsValues.add(model.getCollege());
-            pre = ",";
-        }
-        if (model.getIdentity() != null) {
-            sbSql.append(pre + "identity=?");
-            alParamsValues.add(model.getIdentity());
-            pre = ",";
-        }
-        if (model.getEducation() != null) {
-            sbSql.append(pre + "education=?");
-            alParamsValues.add(model.getEducation());
-            pre = ",";
-        }
-        if (model.getBankname() != null) {
-            sbSql.append(pre + "bankname=?");
-            alParamsValues.add(model.getBankname());
-            pre = ",";
-        }
-        if (model.getAccountno() != null) {
-            sbSql.append(pre + "accountno=?");
-            alParamsValues.add(model.getAccountno());
-            pre = ",";
-        }
-        if (model.getAddressresident() != null) {
-            sbSql.append(pre + "addressresident=?");
-            alParamsValues.add(model.getAddressresident());
-            pre = ",";
-        }
-        if (model.getHealth() != null) {
-            sbSql.append(pre + "health=?");
-            alParamsValues.add(model.getHealth());
-            pre = ",";
-        }
-        if (model.getPostalcode() != null) {
-            sbSql.append(pre + "postalcode=?");
-            alParamsValues.add(model.getPostalcode());
-            pre = ",";
-        }
-        if (model.getPhonehouse() != null) {
-            sbSql.append(pre + "phonehouse=?");
-            alParamsValues.add(model.getPhonehouse());
-            pre = ",";
-        }
-        if (model.getCollegetm() != null) {
-            sbSql.append(pre + "collegetm=?");
-            alParamsValues.add(model.getCollegetm());
-            pre = ",";
-        }
-        if (model.getSpeciality() != null) {
-            sbSql.append(pre + "speciality=?");
-            alParamsValues.add(model.getSpeciality());
-            pre = ",";
-        }
-        if (model.getNativeplace() != null) {
-            sbSql.append(pre + "nativeplace=?");
-            alParamsValues.add(model.getNativeplace());
-            pre = ",";
-        }
-        if (model.getWorktype() != null) {
-            sbSql.append(pre + "worktype=?");
-            alParamsValues.add(model.getWorktype());
-            pre = ",";
-        }
-        if (model.getBlood() != null) {
-            sbSql.append(pre + "blood=?");
-            alParamsValues.add(model.getBlood());
-            pre = ",";
-        }
-        if (model.getSaleno() != null) {
-            sbSql.append(pre + "saleno=?");
-            alParamsValues.add(model.getSaleno());
-            pre = ",";
-        }
-        if (model.getOrglast() != null) {
-            sbSql.append(pre + "orglast=?");
-            alParamsValues.add(model.getOrglast());
-            pre = ",";
-        }
-        if (model.getJoblast() != null) {
-            sbSql.append(pre + "joblast=?");
-            alParamsValues.add(model.getJoblast());
-            pre = ",";
-        }
-        if (model.getHobby() != null) {
-            sbSql.append(pre + "hobby=?");
-            alParamsValues.add(model.getHobby());
-            pre = ",";
-        }
-        if (model.getNamespecial() != null) {
-            sbSql.append(pre + "namespecial=?");
-            alParamsValues.add(model.getNamespecial());
-            pre = ",";
-        }
-        if (model.getPhonespecial() != null) {
-            sbSql.append(pre + "phonespecial=?");
-            alParamsValues.add(model.getPhonespecial());
-            pre = ",";
-        }
-        if (model.getIntimes() != null) {
-            sbSql.append(pre + "intimes=?");
-            alParamsValues.add(model.getIntimes());
-            pre = ",";
-        }
-        if (model.getContracttime() != null) {
-            sbSql.append(pre + "contracttime=?");
-            alParamsValues.add(model.getContracttime());
-            pre = ",";
-        }
-        if (model.getIsteamleader() != null) {
-            sbSql.append(pre + "isteamleader=?");
-            alParamsValues.add(model.getIsteamleader());
-            pre = ",";
-        }
-        if (model.getDocumentno() != null) {
-            sbSql.append(pre + "documentno=?");
-            alParamsValues.add(model.getDocumentno());
-            pre = ",";
-        }
-        if (model.getHrcode() != null) {
-            sbSql.append(pre + "hrcode=?");
-            alParamsValues.add(model.getHrcode());
-            pre = ",";
-        }
-        if (model.getRegulartm() != null) {
-            sbSql.append(pre + "regulartm=?");
-            alParamsValues.add(model.getRegulartm());
-            pre = ",";
-        }
-        if (model.getIntime() != null) {
-            sbSql.append(pre + "intime=?");
-            alParamsValues.add(model.getIntime());
-            pre = ",";
-        }
-        if (model.getSalarycode() != null) {
-            sbSql.append(pre + "salarycode=?");
-            alParamsValues.add(model.getSalarycode());
-            pre = ",";
-        }
-        if (model.getBirthday() != null) {
-            sbSql.append(pre + "birthday=?");
-            alParamsValues.add(model.getBirthday());
-            pre = ",";
-        }
-        if (model.getMarrycode() != null) {
-            sbSql.append(pre + "marrycode=?");
-            alParamsValues.add(model.getMarrycode());
-            pre = ",";
-        }
-        if (model.getStatus() != null) {
-            sbSql.append(pre + "status=?");
-            alParamsValues.add(model.getStatus());
-            pre = ",";
-        }
-        if (model.getWhichteam() != null) {
-            sbSql.append(pre + "whichteam=?");
-            alParamsValues.add(model.getWhichteam());
-            pre = ",";
-        }
-        if (model.getRemark() != null) {
-            sbSql.append(pre + "remark=?");
-            alParamsValues.add(model.getRemark());
-            pre = ",";
-        }
-        if (model.getCheckid() != null) {
-            sbParams.append(preWhere + "checkid=?");
-            alParamsValues.add(model.getCheckid());
-            preWhere = ",";
-        }
-
-
-        if (!sbSql.toString().equalsIgnoreCase("")) {
-            String sql = "update esm_user_internal_check set " + sbSql.toString() + " where " + sbParams.toString();
-
-            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-            Object[] params = alParamsValues.toArray();
-
-            return jdbcTemplate.update(sql, params);
-        }
-
-        return 0;
-
-    }
-
-
-    @Override
-    public Integer delete(String id) {
-
-        String sql = "delete from esm_user_internal_check where checkid=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.update(sql, id);
-    }
-
-
-    @Override
-    public Integer delete(List<EsmUserInternalCheck> lsEsmUserInternalCheck) {
-        String sql = "delete from esm_user_internal_check where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-            @Override
-            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-                preparedStatement.setString(1, lsEsmUserInternalCheck.get(i).getId());
-            }
-
-            @Override
-            public int getBatchSize() {
-                return lsEsmUserInternalCheck.size();
-            }
-        }).length;
-    }
-
-}
+//package com.ydtech.modules.esm.dao.impl;
+//
+//import com.ydtech.modules.esm.dao.EsmUserInternalCheckDao;
+//import com.ydtech.modules.esm.model.EsmUserInternalCheck;
+//import com.ydtech.core.page.PageResult;
+//import com.github.drinkjava2.jdialects.Dialect;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.jdbc.core.JdbcTemplate;
+//import org.springframework.jdbc.core.PreparedStatementCreator;
+//import org.springframework.jdbc.core.RowMapper;
+//import org.springframework.jdbc.support.GeneratedKeyHolder;
+//import org.springframework.jdbc.support.KeyHolder;
+//import org.springframework.stereotype.Repository;
+//import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+//
+//
+//import javax.sql.DataSource;
+//import java.sql.Connection;
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.SQLException;
+//
+//import java.util.Date;
+//import java.util.List;
+//import java.util.ArrayList;
+//
+//
+//@Repository
+//public class EsmUserInternalCheckDaoImpl implements EsmUserInternalCheckDao {
+//
+//    @Autowired
+//    public DataSource dataSource;
+//
+//
+//    public static class EsmUserInternalCheckRowMapper implements RowMapper {
+//        public EsmUserInternalCheck mapRow(ResultSet resultSet, int rowNum) throws SQLException {
+//            EsmUserInternalCheck model = new EsmUserInternalCheck();
+//
+//            model.setCheckid(resultSet.getString("checkid"));
+//            model.setId(resultSet.getString("id"));
+//            model.setAddressnow(resultSet.getString("addressnow"));
+//            model.setNations(resultSet.getString("nations"));
+//            model.setPoliticalstatus(resultSet.getString("politicalstatus"));
+//            model.setCollege(resultSet.getString("college"));
+//            model.setIdentity(resultSet.getString("identity"));
+//            model.setEducation(resultSet.getString("education"));
+//            model.setBankname(resultSet.getString("bankname"));
+//            model.setAccountno(resultSet.getString("accountno"));
+//            model.setAddressresident(resultSet.getString("addressresident"));
+//            model.setHealth(resultSet.getString("health"));
+//            model.setPostalcode(resultSet.getString("postalcode"));
+//            model.setPhonehouse(resultSet.getString("phonehouse"));
+//            model.setCollegetm(resultSet.getDate("collegetm"));
+//            model.setSpeciality(resultSet.getString("speciality"));
+//            model.setNativeplace(resultSet.getString("nativeplace"));
+//            model.setWorktype(resultSet.getString("worktype"));
+//            model.setBlood(resultSet.getString("blood"));
+//            model.setSaleno(resultSet.getString("saleno"));
+//            model.setOrglast(resultSet.getString("orglast"));
+//            model.setJoblast(resultSet.getString("joblast"));
+//            model.setHobby(resultSet.getString("hobby"));
+//            model.setNamespecial(resultSet.getString("namespecial"));
+//            model.setPhonespecial(resultSet.getString("phonespecial"));
+//            model.setIntimes(resultSet.getString("intimes"));
+//            model.setContracttime(resultSet.getDate("contracttime"));
+//            model.setIsteamleader(resultSet.getString("isteamleader"));
+//            model.setDocumentno(resultSet.getString("documentno"));
+//            model.setHrcode(resultSet.getString("hrcode"));
+//            model.setRegulartm(resultSet.getDate("regulartm"));
+//            model.setIntime(resultSet.getDate("intime"));
+//            model.setSalarycode(resultSet.getString("salarycode"));
+//            model.setBirthday(resultSet.getDate("birthday"));
+//            model.setMarrycode(resultSet.getString("marrycode"));
+//            model.setStatus(resultSet.getString("status"));
+//            model.setWhichteam(resultSet.getString("whichteam"));
+//            model.setRemark(resultSet.getString("remark"));
+//
+//            return model;
+//        }
+//    }
+//
+//
+//    @Override
+//    public EsmUserInternalCheck selectByPk(String id) {
+//        String sql = " select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  where checkid=? or id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        List<EsmUserInternalCheck> ls = jdbcTemplate.query(sql, new Object[]{id, id}, new EsmUserInternalCheckRowMapper());
+//
+//        if (ls != null && ls.size() > 0) {
+//            return ls.get(0);
+//        }
+//
+//        return null;
+//    }
+//
+//
+//    @Override
+//    public List<EsmUserInternalCheck> selectAll() {
+//        String sql = "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, new EsmUserInternalCheckRowMapper());
+//    }
+//
+//
+//    public List<EsmUserInternalCheck> selectList(String whereCase, Object[] paramValues) {
+//        String sql = "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  " + whereCase;
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, paramValues, new EsmUserInternalCheckRowMapper());
+//    }
+//
+//
+//    public Integer count(String whereCase, Object[] paramValues) {
+//        String sql = "select count(1) from esm_user_internal_check t " + whereCase;
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
+//    }
+//
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
+//
+//        Dialect dialect = Dialect.guessDialect(dataSource);
+//        String sql = dialect.pagin(pageNumber, pageSize, "select t.checkid, t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal_check t  " + whereCase);
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        List<EsmUserInternalCheck> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserInternalCheckRowMapper());
+//
+//        int totalCount = count(whereCase, paramValues);
+//
+//        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
+//
+//        return pageResult;
+//    }
+//
+//
+//    @Override
+//    public Integer insert(EsmUserInternalCheck model) {
+//
+//        String sql = "insert into esm_user_internal_check (checkid, id, addressnow, nations, politicalstatus, college, identity, education, bankname, accountno, addressresident, health, postalcode, phonehouse, collegetm, speciality, nativeplace, worktype, blood, saleno, orglast, joblast, hobby, namespecial, phonespecial, intimes, contracttime, isteamleader, documentno, hrcode, regulartm, intime, salarycode, birthday, marrycode, status, whichteam, remark) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = new Object[]{model.getCheckid(), model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark()};
+//
+//        int out = jdbcTemplate.update(sql, params);
+//
+//        return out;
+//    }
+//
+//
+//    @Override
+//    public Integer insertSelective(EsmUserInternalCheck model) {
+//
+//        StringBuffer sbSql = new StringBuffer();
+//        StringBuffer sbParams = new StringBuffer();
+//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
+//
+//        String pre = "";
+//
+//        if (model.getCheckid() != null) {
+//            sbSql.append(pre + "checkid");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCheckid());
+//            pre = ",";
+//        }
+//        if (model.getId() != null) {
+//            sbSql.append(pre + "id");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getId());
+//            pre = ",";
+//        }
+//        if (model.getAddressnow() != null) {
+//            sbSql.append(pre + "addressnow");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getAddressnow());
+//            pre = ",";
+//        }
+//        if (model.getNations() != null) {
+//            sbSql.append(pre + "nations");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getNations());
+//            pre = ",";
+//        }
+//        if (model.getPoliticalstatus() != null) {
+//            sbSql.append(pre + "politicalstatus");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPoliticalstatus());
+//            pre = ",";
+//        }
+//        if (model.getCollege() != null) {
+//            sbSql.append(pre + "college");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCollege());
+//            pre = ",";
+//        }
+//        if (model.getIdentity() != null) {
+//            sbSql.append(pre + "identity");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIdentity());
+//            pre = ",";
+//        }
+//        if (model.getEducation() != null) {
+//            sbSql.append(pre + "education");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getEducation());
+//            pre = ",";
+//        }
+//        if (model.getBankname() != null) {
+//            sbSql.append(pre + "bankname");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getBankname());
+//            pre = ",";
+//        }
+//        if (model.getAccountno() != null) {
+//            sbSql.append(pre + "accountno");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getAccountno());
+//            pre = ",";
+//        }
+//        if (model.getAddressresident() != null) {
+//            sbSql.append(pre + "addressresident");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getAddressresident());
+//            pre = ",";
+//        }
+//        if (model.getHealth() != null) {
+//            sbSql.append(pre + "health");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getHealth());
+//            pre = ",";
+//        }
+//        if (model.getPostalcode() != null) {
+//            sbSql.append(pre + "postalcode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPostalcode());
+//            pre = ",";
+//        }
+//        if (model.getPhonehouse() != null) {
+//            sbSql.append(pre + "phonehouse");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPhonehouse());
+//            pre = ",";
+//        }
+//        if (model.getCollegetm() != null) {
+//            sbSql.append(pre + "collegetm");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCollegetm());
+//            pre = ",";
+//        }
+//        if (model.getSpeciality() != null) {
+//            sbSql.append(pre + "speciality");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getSpeciality());
+//            pre = ",";
+//        }
+//        if (model.getNativeplace() != null) {
+//            sbSql.append(pre + "nativeplace");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getNativeplace());
+//            pre = ",";
+//        }
+//        if (model.getWorktype() != null) {
+//            sbSql.append(pre + "worktype");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getWorktype());
+//            pre = ",";
+//        }
+//        if (model.getBlood() != null) {
+//            sbSql.append(pre + "blood");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getBlood());
+//            pre = ",";
+//        }
+//        if (model.getSaleno() != null) {
+//            sbSql.append(pre + "saleno");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getSaleno());
+//            pre = ",";
+//        }
+//        if (model.getOrglast() != null) {
+//            sbSql.append(pre + "orglast");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getOrglast());
+//            pre = ",";
+//        }
+//        if (model.getJoblast() != null) {
+//            sbSql.append(pre + "joblast");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getJoblast());
+//            pre = ",";
+//        }
+//        if (model.getHobby() != null) {
+//            sbSql.append(pre + "hobby");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getHobby());
+//            pre = ",";
+//        }
+//        if (model.getNamespecial() != null) {
+//            sbSql.append(pre + "namespecial");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getNamespecial());
+//            pre = ",";
+//        }
+//        if (model.getPhonespecial() != null) {
+//            sbSql.append(pre + "phonespecial");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPhonespecial());
+//            pre = ",";
+//        }
+//        if (model.getIntimes() != null) {
+//            sbSql.append(pre + "intimes");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIntimes());
+//            pre = ",";
+//        }
+//        if (model.getContracttime() != null) {
+//            sbSql.append(pre + "contracttime");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getContracttime());
+//            pre = ",";
+//        }
+//        if (model.getIsteamleader() != null) {
+//            sbSql.append(pre + "isteamleader");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIsteamleader());
+//            pre = ",";
+//        }
+//        if (model.getDocumentno() != null) {
+//            sbSql.append(pre + "documentno");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getDocumentno());
+//            pre = ",";
+//        }
+//        if (model.getHrcode() != null) {
+//            sbSql.append(pre + "hrcode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getHrcode());
+//            pre = ",";
+//        }
+//        if (model.getRegulartm() != null) {
+//            sbSql.append(pre + "regulartm");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getRegulartm());
+//            pre = ",";
+//        }
+//        if (model.getIntime() != null) {
+//            sbSql.append(pre + "intime");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIntime());
+//            pre = ",";
+//        }
+//        if (model.getSalarycode() != null) {
+//            sbSql.append(pre + "salarycode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getSalarycode());
+//            pre = ",";
+//        }
+//        if (model.getBirthday() != null) {
+//            sbSql.append(pre + "birthday");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getBirthday());
+//            pre = ",";
+//        }
+//        if (model.getMarrycode() != null) {
+//            sbSql.append(pre + "marrycode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getMarrycode());
+//            pre = ",";
+//        }
+//        if (model.getStatus() != null) {
+//            sbSql.append(pre + "status");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getStatus());
+//            pre = ",";
+//        }
+//        if (model.getWhichteam() != null) {
+//            sbSql.append(pre + "whichteam");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getWhichteam());
+//            pre = ",";
+//        }
+//        if (model.getRemark() != null) {
+//            sbSql.append(pre + "remark");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getRemark());
+//            pre = ",";
+//        }
+//
+//
+//        String sql = "INSERT INTO esm_user_internal_check (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = alParamsValues.toArray();
+//
+//        int out = jdbcTemplate.update(sql, params);
+//
+//        return out;
+//    }
+//
+//
+//    @Override
+//    public Integer update(EsmUserInternalCheck model) {
+//
+//        String sql = "update esm_user_internal_check set id=?, addressnow=?, nations=?, politicalstatus=?, college=?, identity=?, education=?, bankname=?, accountno=?, addressresident=?, health=?, postalcode=?, phonehouse=?, collegetm=?, speciality=?, nativeplace=?, worktype=?, blood=?, saleno=?, orglast=?, joblast=?, hobby=?, namespecial=?, phonespecial=?, intimes=?, contracttime=?, isteamleader=?, documentno=?, hrcode=?, regulartm=?, intime=?, salarycode=?, birthday=?, marrycode=?, status=?, whichteam=?, remark=? where checkid=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = new Object[]{model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark(), model.getCheckid()};
+//
+//        return jdbcTemplate.update(sql, params);
+//    }
+//
+//
+//    @Override
+//    public Integer updateSelective(EsmUserInternalCheck model) {
+//
+//        StringBuffer sbSql = new StringBuffer();
+//        StringBuffer sbParams = new StringBuffer();
+//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
+//
+//        String pre = "";
+//        String preWhere = "";
+//
+//        if (model.getAddressnow() != null) {
+//            sbSql.append(pre + "addressnow=?");
+//            alParamsValues.add(model.getAddressnow());
+//            pre = ",";
+//        }
+//        if (model.getNations() != null) {
+//            sbSql.append(pre + "nations=?");
+//            alParamsValues.add(model.getNations());
+//            pre = ",";
+//        }
+//        if (model.getPoliticalstatus() != null) {
+//            sbSql.append(pre + "politicalstatus=?");
+//            alParamsValues.add(model.getPoliticalstatus());
+//            pre = ",";
+//        }
+//        if (model.getCollege() != null) {
+//            sbSql.append(pre + "college=?");
+//            alParamsValues.add(model.getCollege());
+//            pre = ",";
+//        }
+//        if (model.getIdentity() != null) {
+//            sbSql.append(pre + "identity=?");
+//            alParamsValues.add(model.getIdentity());
+//            pre = ",";
+//        }
+//        if (model.getEducation() != null) {
+//            sbSql.append(pre + "education=?");
+//            alParamsValues.add(model.getEducation());
+//            pre = ",";
+//        }
+//        if (model.getBankname() != null) {
+//            sbSql.append(pre + "bankname=?");
+//            alParamsValues.add(model.getBankname());
+//            pre = ",";
+//        }
+//        if (model.getAccountno() != null) {
+//            sbSql.append(pre + "accountno=?");
+//            alParamsValues.add(model.getAccountno());
+//            pre = ",";
+//        }
+//        if (model.getAddressresident() != null) {
+//            sbSql.append(pre + "addressresident=?");
+//            alParamsValues.add(model.getAddressresident());
+//            pre = ",";
+//        }
+//        if (model.getHealth() != null) {
+//            sbSql.append(pre + "health=?");
+//            alParamsValues.add(model.getHealth());
+//            pre = ",";
+//        }
+//        if (model.getPostalcode() != null) {
+//            sbSql.append(pre + "postalcode=?");
+//            alParamsValues.add(model.getPostalcode());
+//            pre = ",";
+//        }
+//        if (model.getPhonehouse() != null) {
+//            sbSql.append(pre + "phonehouse=?");
+//            alParamsValues.add(model.getPhonehouse());
+//            pre = ",";
+//        }
+//        if (model.getCollegetm() != null) {
+//            sbSql.append(pre + "collegetm=?");
+//            alParamsValues.add(model.getCollegetm());
+//            pre = ",";
+//        }
+//        if (model.getSpeciality() != null) {
+//            sbSql.append(pre + "speciality=?");
+//            alParamsValues.add(model.getSpeciality());
+//            pre = ",";
+//        }
+//        if (model.getNativeplace() != null) {
+//            sbSql.append(pre + "nativeplace=?");
+//            alParamsValues.add(model.getNativeplace());
+//            pre = ",";
+//        }
+//        if (model.getWorktype() != null) {
+//            sbSql.append(pre + "worktype=?");
+//            alParamsValues.add(model.getWorktype());
+//            pre = ",";
+//        }
+//        if (model.getBlood() != null) {
+//            sbSql.append(pre + "blood=?");
+//            alParamsValues.add(model.getBlood());
+//            pre = ",";
+//        }
+//        if (model.getSaleno() != null) {
+//            sbSql.append(pre + "saleno=?");
+//            alParamsValues.add(model.getSaleno());
+//            pre = ",";
+//        }
+//        if (model.getOrglast() != null) {
+//            sbSql.append(pre + "orglast=?");
+//            alParamsValues.add(model.getOrglast());
+//            pre = ",";
+//        }
+//        if (model.getJoblast() != null) {
+//            sbSql.append(pre + "joblast=?");
+//            alParamsValues.add(model.getJoblast());
+//            pre = ",";
+//        }
+//        if (model.getHobby() != null) {
+//            sbSql.append(pre + "hobby=?");
+//            alParamsValues.add(model.getHobby());
+//            pre = ",";
+//        }
+//        if (model.getNamespecial() != null) {
+//            sbSql.append(pre + "namespecial=?");
+//            alParamsValues.add(model.getNamespecial());
+//            pre = ",";
+//        }
+//        if (model.getPhonespecial() != null) {
+//            sbSql.append(pre + "phonespecial=?");
+//            alParamsValues.add(model.getPhonespecial());
+//            pre = ",";
+//        }
+//        if (model.getIntimes() != null) {
+//            sbSql.append(pre + "intimes=?");
+//            alParamsValues.add(model.getIntimes());
+//            pre = ",";
+//        }
+//        if (model.getContracttime() != null) {
+//            sbSql.append(pre + "contracttime=?");
+//            alParamsValues.add(model.getContracttime());
+//            pre = ",";
+//        }
+//        if (model.getIsteamleader() != null) {
+//            sbSql.append(pre + "isteamleader=?");
+//            alParamsValues.add(model.getIsteamleader());
+//            pre = ",";
+//        }
+//        if (model.getDocumentno() != null) {
+//            sbSql.append(pre + "documentno=?");
+//            alParamsValues.add(model.getDocumentno());
+//            pre = ",";
+//        }
+//        if (model.getHrcode() != null) {
+//            sbSql.append(pre + "hrcode=?");
+//            alParamsValues.add(model.getHrcode());
+//            pre = ",";
+//        }
+//        if (model.getRegulartm() != null) {
+//            sbSql.append(pre + "regulartm=?");
+//            alParamsValues.add(model.getRegulartm());
+//            pre = ",";
+//        }
+//        if (model.getIntime() != null) {
+//            sbSql.append(pre + "intime=?");
+//            alParamsValues.add(model.getIntime());
+//            pre = ",";
+//        }
+//        if (model.getSalarycode() != null) {
+//            sbSql.append(pre + "salarycode=?");
+//            alParamsValues.add(model.getSalarycode());
+//            pre = ",";
+//        }
+//        if (model.getBirthday() != null) {
+//            sbSql.append(pre + "birthday=?");
+//            alParamsValues.add(model.getBirthday());
+//            pre = ",";
+//        }
+//        if (model.getMarrycode() != null) {
+//            sbSql.append(pre + "marrycode=?");
+//            alParamsValues.add(model.getMarrycode());
+//            pre = ",";
+//        }
+//        if (model.getStatus() != null) {
+//            sbSql.append(pre + "status=?");
+//            alParamsValues.add(model.getStatus());
+//            pre = ",";
+//        }
+//        if (model.getWhichteam() != null) {
+//            sbSql.append(pre + "whichteam=?");
+//            alParamsValues.add(model.getWhichteam());
+//            pre = ",";
+//        }
+//        if (model.getRemark() != null) {
+//            sbSql.append(pre + "remark=?");
+//            alParamsValues.add(model.getRemark());
+//            pre = ",";
+//        }
+//        if (model.getCheckid() != null) {
+//            sbParams.append(preWhere + "checkid=?");
+//            alParamsValues.add(model.getCheckid());
+//            preWhere = ",";
+//        }
+//
+//
+//        if (!sbSql.toString().equalsIgnoreCase("")) {
+//            String sql = "update esm_user_internal_check set " + sbSql.toString() + " where " + sbParams.toString();
+//
+//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//            Object[] params = alParamsValues.toArray();
+//
+//            return jdbcTemplate.update(sql, params);
+//        }
+//
+//        return 0;
+//
+//    }
+//
+//
+//    @Override
+//    public Integer delete(String id) {
+//
+//        String sql = "delete from esm_user_internal_check where checkid=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.update(sql, id);
+//    }
+//
+//
+//    @Override
+//    public Integer delete(List<EsmUserInternalCheck> lsEsmUserInternalCheck) {
+//        String sql = "delete from esm_user_internal_check where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+//            @Override
+//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+//                preparedStatement.setString(1, lsEsmUserInternalCheck.get(i).getId());
+//            }
+//
+//            @Override
+//            public int getBatchSize() {
+//                return lsEsmUserInternalCheck.size();
+//            }
+//        }).length;
+//    }
+//
+//}

src/main/java/com/ydtech/modules/esm/dao/impl/EsmUserInternalDaoImpl.java

@@ -1,657 +1,657 @@
-package com.ydtech.modules.esm.dao.impl;
-
-import com.ydtech.modules.esm.dao.EsmUserInternalDao;
-import com.ydtech.modules.esm.model.EsmUserInternal;
-import com.ydtech.core.page.PageResult;
-import com.github.drinkjava2.jdialects.Dialect;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.PreparedStatementCreator;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.stereotype.Repository;
-import org.springframework.jdbc.core.BatchPreparedStatementSetter;
-
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-
-
-@Repository
-public class EsmUserInternalDaoImpl implements EsmUserInternalDao {
-
-    @Autowired
-    public DataSource dataSource;
-
-
-    public static class EsmUserInternalRowMapper implements RowMapper {
-        public EsmUserInternal mapRow(ResultSet resultSet, int rowNum) throws SQLException {
-            EsmUserInternal model = new EsmUserInternal();
-
-            model.setId(resultSet.getString("id"));
-            model.setAddressnow(resultSet.getString("addressnow"));
-            model.setNations(resultSet.getString("nations"));
-            model.setPoliticalstatus(resultSet.getString("politicalstatus"));
-            model.setCollege(resultSet.getString("college"));
-            model.setIdentity(resultSet.getString("identity"));
-            model.setEducation(resultSet.getString("education"));
-            model.setBankname(resultSet.getString("bankname"));
-            model.setAccountno(resultSet.getString("accountno"));
-            model.setAddressresident(resultSet.getString("addressresident"));
-            model.setHealth(resultSet.getString("health"));
-            model.setPostalcode(resultSet.getString("postalcode"));
-            model.setPhonehouse(resultSet.getString("phonehouse"));
-            model.setCollegetm(resultSet.getDate("collegetm"));
-            model.setSpeciality(resultSet.getString("speciality"));
-            model.setNativeplace(resultSet.getString("nativeplace"));
-            model.setWorktype(resultSet.getString("worktype"));
-            model.setBlood(resultSet.getString("blood"));
-            model.setSaleno(resultSet.getString("saleno"));
-            model.setOrglast(resultSet.getString("orglast"));
-            model.setJoblast(resultSet.getString("joblast"));
-            model.setHobby(resultSet.getString("hobby"));
-            model.setNamespecial(resultSet.getString("namespecial"));
-            model.setPhonespecial(resultSet.getString("phonespecial"));
-            model.setIntimes(resultSet.getString("intimes"));
-            model.setContracttime(resultSet.getDate("contracttime"));
-            model.setIsteamleader(resultSet.getString("isteamleader"));
-            model.setDocumentno(resultSet.getString("documentno"));
-            model.setHrcode(resultSet.getString("hrcode"));
-            model.setRegulartm(resultSet.getDate("regulartm"));
-            model.setIntime(resultSet.getDate("intime"));
-            model.setSalarycode(resultSet.getString("salarycode"));
-            model.setBirthday(resultSet.getDate("birthday"));
-            model.setMarrycode(resultSet.getString("marrycode"));
-            model.setStatus(resultSet.getString("status"));
-            model.setWhichteam(resultSet.getString("whichteam"));
-            model.setRemark(resultSet.getString("remark"));
-
-            return model;
-        }
-    }
-
-
-    @Override
-    public EsmUserInternal selectByPk(String id) {
-        String sql = " select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  where id=? ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        List<EsmUserInternal> ls = jdbcTemplate.query(sql, new Object[]{id}, new EsmUserInternalRowMapper());
-
-        if (ls != null && ls.size() > 0) {
-            return ls.get(0);
-        }
-
-        return null;
-    }
-
-
-    @Override
-    public List<EsmUserInternal> selectAll() {
-        String sql = "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.query(sql, new EsmUserInternalRowMapper());
-    }
-
-
-    public List<EsmUserInternal> selectList(String whereCase, Object[] paramValues) {
-        String sql = "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  " + whereCase;
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.query(sql, paramValues, new EsmUserInternalRowMapper());
-    }
-
-
-    public Integer count(String whereCase, Object[] paramValues) {
-        String sql = "select count(1) from esm_user_internal t " + whereCase;
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-    }
-
-
-    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-
-        Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  " + whereCase);
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        List<EsmUserInternal> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserInternalRowMapper());
-
-        int totalCount = count(whereCase, paramValues);
-
-        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-
-        return pageResult;
-    }
-
-
-    @Override
-    public Integer insert(EsmUserInternal model) {
-
-        String sql = "insert into esm_user_internal ( id, addressnow, nations, politicalstatus, college, identity, education, bankname, accountno, addressresident, health, postalcode, phonehouse, collegetm, speciality, nativeplace, worktype, blood, saleno, orglast, joblast, hobby, namespecial, phonespecial, intimes, contracttime, isteamleader, documentno, hrcode, regulartm, intime, salarycode, birthday, marrycode, status, whichteam, remark) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = new Object[]{model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark()};
-
-        int out = jdbcTemplate.update(sql, params);
-
-        return out;
-    }
-
-
-    @Override
-    public Integer insertSelective(EsmUserInternal model) {
-
-        StringBuffer sbSql = new StringBuffer();
-        StringBuffer sbParams = new StringBuffer();
-        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-
-        String pre = "";
-
-        if (model.getId() != null) {
-            sbSql.append(pre + "id");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getId());
-            pre = ",";
-        }
-        if (model.getAddressnow() != null) {
-            sbSql.append(pre + "addressnow");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getAddressnow());
-            pre = ",";
-        }
-        if (model.getNations() != null) {
-            sbSql.append(pre + "nations");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getNations());
-            pre = ",";
-        }
-        if (model.getPoliticalstatus() != null) {
-            sbSql.append(pre + "politicalstatus");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPoliticalstatus());
-            pre = ",";
-        }
-        if (model.getCollege() != null) {
-            sbSql.append(pre + "college");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCollege());
-            pre = ",";
-        }
-        if (model.getIdentity() != null) {
-            sbSql.append(pre + "identity");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIdentity());
-            pre = ",";
-        }
-        if (model.getEducation() != null) {
-            sbSql.append(pre + "education");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getEducation());
-            pre = ",";
-        }
-        if (model.getBankname() != null) {
-            sbSql.append(pre + "bankname");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getBankname());
-            pre = ",";
-        }
-        if (model.getAccountno() != null) {
-            sbSql.append(pre + "accountno");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getAccountno());
-            pre = ",";
-        }
-        if (model.getAddressresident() != null) {
-            sbSql.append(pre + "addressresident");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getAddressresident());
-            pre = ",";
-        }
-        if (model.getHealth() != null) {
-            sbSql.append(pre + "health");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getHealth());
-            pre = ",";
-        }
-        if (model.getPostalcode() != null) {
-            sbSql.append(pre + "postalcode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPostalcode());
-            pre = ",";
-        }
-        if (model.getPhonehouse() != null) {
-            sbSql.append(pre + "phonehouse");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPhonehouse());
-            pre = ",";
-        }
-        if (model.getCollegetm() != null) {
-            sbSql.append(pre + "collegetm");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getCollegetm());
-            pre = ",";
-        }
-        if (model.getSpeciality() != null) {
-            sbSql.append(pre + "speciality");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getSpeciality());
-            pre = ",";
-        }
-        if (model.getNativeplace() != null) {
-            sbSql.append(pre + "nativeplace");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getNativeplace());
-            pre = ",";
-        }
-        if (model.getWorktype() != null) {
-            sbSql.append(pre + "worktype");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getWorktype());
-            pre = ",";
-        }
-        if (model.getBlood() != null) {
-            sbSql.append(pre + "blood");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getBlood());
-            pre = ",";
-        }
-        if (model.getSaleno() != null) {
-            sbSql.append(pre + "saleno");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getSaleno());
-            pre = ",";
-        }
-        if (model.getOrglast() != null) {
-            sbSql.append(pre + "orglast");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getOrglast());
-            pre = ",";
-        }
-        if (model.getJoblast() != null) {
-            sbSql.append(pre + "joblast");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getJoblast());
-            pre = ",";
-        }
-        if (model.getHobby() != null) {
-            sbSql.append(pre + "hobby");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getHobby());
-            pre = ",";
-        }
-        if (model.getNamespecial() != null) {
-            sbSql.append(pre + "namespecial");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getNamespecial());
-            pre = ",";
-        }
-        if (model.getPhonespecial() != null) {
-            sbSql.append(pre + "phonespecial");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getPhonespecial());
-            pre = ",";
-        }
-        if (model.getIntimes() != null) {
-            sbSql.append(pre + "intimes");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIntimes());
-            pre = ",";
-        }
-        if (model.getContracttime() != null) {
-            sbSql.append(pre + "contracttime");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getContracttime());
-            pre = ",";
-        }
-        if (model.getIsteamleader() != null) {
-            sbSql.append(pre + "isteamleader");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIsteamleader());
-            pre = ",";
-        }
-        if (model.getDocumentno() != null) {
-            sbSql.append(pre + "documentno");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getDocumentno());
-            pre = ",";
-        }
-        if (model.getHrcode() != null) {
-            sbSql.append(pre + "hrcode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getHrcode());
-            pre = ",";
-        }
-        if (model.getRegulartm() != null) {
-            sbSql.append(pre + "regulartm");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getRegulartm());
-            pre = ",";
-        }
-        if (model.getIntime() != null) {
-            sbSql.append(pre + "intime");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getIntime());
-            pre = ",";
-        }
-        if (model.getSalarycode() != null) {
-            sbSql.append(pre + "salarycode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getSalarycode());
-            pre = ",";
-        }
-        if (model.getBirthday() != null) {
-            sbSql.append(pre + "birthday");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getBirthday());
-            pre = ",";
-        }
-        if (model.getMarrycode() != null) {
-            sbSql.append(pre + "marrycode");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getMarrycode());
-            pre = ",";
-        }
-        if (model.getStatus() != null) {
-            sbSql.append(pre + "status");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getStatus());
-            pre = ",";
-        }
-        if (model.getWhichteam() != null) {
-            sbSql.append(pre + "whichteam");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getWhichteam());
-            pre = ",";
-        }
-        if (model.getRemark() != null) {
-            sbSql.append(pre + "remark");
-            sbParams.append(pre + "?");
-            alParamsValues.add(model.getRemark());
-            pre = ",";
-        }
-
-
-        String sql = "INSERT INTO esm_user_internal (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = alParamsValues.toArray();
-
-        int out = jdbcTemplate.update(sql, params);
-
-        return out;
-    }
-
-
-    @Override
-    public Integer update(EsmUserInternal model) {
-
-        String sql = "update esm_user_internal set addressnow=?, nations=?, politicalstatus=?, college=?, identity=?, education=?, bankname=?, accountno=?, addressresident=?, health=?, postalcode=?, phonehouse=?, collegetm=?, speciality=?, nativeplace=?, worktype=?, blood=?, saleno=?, orglast=?, joblast=?, hobby=?, namespecial=?, phonespecial=?, intimes=?, contracttime=?, isteamleader=?, documentno=?, hrcode=?, regulartm=?, intime=?, salarycode=?, birthday=?, marrycode=?, status=?, whichteam=?, remark=? where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        Object[] params = new Object[]{model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark(), model.getId()};
-
-        return jdbcTemplate.update(sql, params);
-    }
-
-
-    @Override
-    public Integer updateSelective(EsmUserInternal model) {
-
-        StringBuffer sbSql = new StringBuffer();
-        StringBuffer sbParams = new StringBuffer();
-        ArrayList<Object> alParamsValues = new ArrayList<Object>();
-
-        String pre = "";
-        String preWhere = "";
-
-        if (model.getAddressnow() != null) {
-            sbSql.append(pre + "addressnow=?");
-            alParamsValues.add(model.getAddressnow());
-            pre = ",";
-        }
-        if (model.getNations() != null) {
-            sbSql.append(pre + "nations=?");
-            alParamsValues.add(model.getNations());
-            pre = ",";
-        }
-        if (model.getPoliticalstatus() != null) {
-            sbSql.append(pre + "politicalstatus=?");
-            alParamsValues.add(model.getPoliticalstatus());
-            pre = ",";
-        }
-        if (model.getCollege() != null) {
-            sbSql.append(pre + "college=?");
-            alParamsValues.add(model.getCollege());
-            pre = ",";
-        }
-        if (model.getIdentity() != null) {
-            sbSql.append(pre + "identity=?");
-            alParamsValues.add(model.getIdentity());
-            pre = ",";
-        }
-        if (model.getEducation() != null) {
-            sbSql.append(pre + "education=?");
-            alParamsValues.add(model.getEducation());
-            pre = ",";
-        }
-        if (model.getBankname() != null) {
-            sbSql.append(pre + "bankname=?");
-            alParamsValues.add(model.getBankname());
-            pre = ",";
-        }
-        if (model.getAccountno() != null) {
-            sbSql.append(pre + "accountno=?");
-            alParamsValues.add(model.getAccountno());
-            pre = ",";
-        }
-        if (model.getAddressresident() != null) {
-            sbSql.append(pre + "addressresident=?");
-            alParamsValues.add(model.getAddressresident());
-            pre = ",";
-        }
-        if (model.getHealth() != null) {
-            sbSql.append(pre + "health=?");
-            alParamsValues.add(model.getHealth());
-            pre = ",";
-        }
-        if (model.getPostalcode() != null) {
-            sbSql.append(pre + "postalcode=?");
-            alParamsValues.add(model.getPostalcode());
-            pre = ",";
-        }
-        if (model.getPhonehouse() != null) {
-            sbSql.append(pre + "phonehouse=?");
-            alParamsValues.add(model.getPhonehouse());
-            pre = ",";
-        }
-        if (model.getCollegetm() != null) {
-            sbSql.append(pre + "collegetm=?");
-            alParamsValues.add(model.getCollegetm());
-            pre = ",";
-        }
-        if (model.getSpeciality() != null) {
-            sbSql.append(pre + "speciality=?");
-            alParamsValues.add(model.getSpeciality());
-            pre = ",";
-        }
-        if (model.getNativeplace() != null) {
-            sbSql.append(pre + "nativeplace=?");
-            alParamsValues.add(model.getNativeplace());
-            pre = ",";
-        }
-        if (model.getWorktype() != null) {
-            sbSql.append(pre + "worktype=?");
-            alParamsValues.add(model.getWorktype());
-            pre = ",";
-        }
-        if (model.getBlood() != null) {
-            sbSql.append(pre + "blood=?");
-            alParamsValues.add(model.getBlood());
-            pre = ",";
-        }
-        if (model.getSaleno() != null) {
-            sbSql.append(pre + "saleno=?");
-            alParamsValues.add(model.getSaleno());
-            pre = ",";
-        }
-        if (model.getOrglast() != null) {
-            sbSql.append(pre + "orglast=?");
-            alParamsValues.add(model.getOrglast());
-            pre = ",";
-        }
-        if (model.getJoblast() != null) {
-            sbSql.append(pre + "joblast=?");
-            alParamsValues.add(model.getJoblast());
-            pre = ",";
-        }
-        if (model.getHobby() != null) {
-            sbSql.append(pre + "hobby=?");
-            alParamsValues.add(model.getHobby());
-            pre = ",";
-        }
-        if (model.getNamespecial() != null) {
-            sbSql.append(pre + "namespecial=?");
-            alParamsValues.add(model.getNamespecial());
-            pre = ",";
-        }
-        if (model.getPhonespecial() != null) {
-            sbSql.append(pre + "phonespecial=?");
-            alParamsValues.add(model.getPhonespecial());
-            pre = ",";
-        }
-        if (model.getIntimes() != null) {
-            sbSql.append(pre + "intimes=?");
-            alParamsValues.add(model.getIntimes());
-            pre = ",";
-        }
-        if (model.getContracttime() != null) {
-            sbSql.append(pre + "contracttime=?");
-            alParamsValues.add(model.getContracttime());
-            pre = ",";
-        }
-        if (model.getIsteamleader() != null) {
-            sbSql.append(pre + "isteamleader=?");
-            alParamsValues.add(model.getIsteamleader());
-            pre = ",";
-        }
-        if (model.getDocumentno() != null) {
-            sbSql.append(pre + "documentno=?");
-            alParamsValues.add(model.getDocumentno());
-            pre = ",";
-        }
-        if (model.getHrcode() != null) {
-            sbSql.append(pre + "hrcode=?");
-            alParamsValues.add(model.getHrcode());
-            pre = ",";
-        }
-        if (model.getRegulartm() != null) {
-            sbSql.append(pre + "regulartm=?");
-            alParamsValues.add(model.getRegulartm());
-            pre = ",";
-        }
-        if (model.getIntime() != null) {
-            sbSql.append(pre + "intime=?");
-            alParamsValues.add(model.getIntime());
-            pre = ",";
-        }
-        if (model.getSalarycode() != null) {
-            sbSql.append(pre + "salarycode=?");
-            alParamsValues.add(model.getSalarycode());
-            pre = ",";
-        }
-        if (model.getBirthday() != null) {
-            sbSql.append(pre + "birthday=?");
-            alParamsValues.add(model.getBirthday());
-            pre = ",";
-        }
-        if (model.getMarrycode() != null) {
-            sbSql.append(pre + "marrycode=?");
-            alParamsValues.add(model.getMarrycode());
-            pre = ",";
-        }
-        if (model.getStatus() != null) {
-            sbSql.append(pre + "status=?");
-            alParamsValues.add(model.getStatus());
-            pre = ",";
-        }
-        if (model.getWhichteam() != null) {
-            sbSql.append(pre + "whichteam=?");
-            alParamsValues.add(model.getWhichteam());
-            pre = ",";
-        }
-        if (model.getRemark() != null) {
-            sbSql.append(pre + "remark=?");
-            alParamsValues.add(model.getRemark());
-            pre = ",";
-        }
-        if (model.getId() != null) {
-            sbParams.append(preWhere + "id=?");
-            alParamsValues.add(model.getId());
-            preWhere = ",";
-        }
-
-
-        if (!sbSql.toString().equalsIgnoreCase("")) {
-            String sql = "update esm_user_internal set " + sbSql.toString() + " where " + sbParams.toString();
-
-            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-            Object[] params = alParamsValues.toArray();
-
-            return jdbcTemplate.update(sql, params);
-        }
-
-        return 0;
-
-    }
-
-
-    @Override
-    public Integer delete(String id) {
-
-        String sql = "delete from esm_user_internal where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.update(sql, id);
-    }
-
-
-    @Override
-    public Integer delete(List<EsmUserInternal> lsEsmUserInternal) {
-        String sql = "delete from esm_user_internal where id=?";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
-        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
-            @Override
-            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
-                preparedStatement.setString(1, lsEsmUserInternal.get(i).getId());
-            }
-
-            @Override
-            public int getBatchSize() {
-                return lsEsmUserInternal.size();
-            }
-        }).length;
-    }
-
-}
+//package com.ydtech.modules.esm.dao.impl;
+//
+//import com.ydtech.modules.esm.dao.EsmUserInternalDao;
+//import com.ydtech.modules.esm.model.EsmUserInternal;
+//import com.ydtech.core.page.PageResult;
+//import com.github.drinkjava2.jdialects.Dialect;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.jdbc.core.JdbcTemplate;
+//import org.springframework.jdbc.core.PreparedStatementCreator;
+//import org.springframework.jdbc.core.RowMapper;
+//import org.springframework.jdbc.support.GeneratedKeyHolder;
+//import org.springframework.jdbc.support.KeyHolder;
+//import org.springframework.stereotype.Repository;
+//import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+//
+//
+//import javax.sql.DataSource;
+//import java.sql.Connection;
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.SQLException;
+//
+//import java.util.Date;
+//import java.util.List;
+//import java.util.ArrayList;
+//
+//
+//@Repository
+//public class EsmUserInternalDaoImpl implements EsmUserInternalDao {
+//
+//    @Autowired
+//    public DataSource dataSource;
+//
+//
+//    public static class EsmUserInternalRowMapper implements RowMapper {
+//        public EsmUserInternal mapRow(ResultSet resultSet, int rowNum) throws SQLException {
+//            EsmUserInternal model = new EsmUserInternal();
+//
+//            model.setId(resultSet.getString("id"));
+//            model.setAddressnow(resultSet.getString("addressnow"));
+//            model.setNations(resultSet.getString("nations"));
+//            model.setPoliticalstatus(resultSet.getString("politicalstatus"));
+//            model.setCollege(resultSet.getString("college"));
+//            model.setIdentity(resultSet.getString("identity"));
+//            model.setEducation(resultSet.getString("education"));
+//            model.setBankname(resultSet.getString("bankname"));
+//            model.setAccountno(resultSet.getString("accountno"));
+//            model.setAddressresident(resultSet.getString("addressresident"));
+//            model.setHealth(resultSet.getString("health"));
+//            model.setPostalcode(resultSet.getString("postalcode"));
+//            model.setPhonehouse(resultSet.getString("phonehouse"));
+//            model.setCollegetm(resultSet.getDate("collegetm"));
+//            model.setSpeciality(resultSet.getString("speciality"));
+//            model.setNativeplace(resultSet.getString("nativeplace"));
+//            model.setWorktype(resultSet.getString("worktype"));
+//            model.setBlood(resultSet.getString("blood"));
+//            model.setSaleno(resultSet.getString("saleno"));
+//            model.setOrglast(resultSet.getString("orglast"));
+//            model.setJoblast(resultSet.getString("joblast"));
+//            model.setHobby(resultSet.getString("hobby"));
+//            model.setNamespecial(resultSet.getString("namespecial"));
+//            model.setPhonespecial(resultSet.getString("phonespecial"));
+//            model.setIntimes(resultSet.getString("intimes"));
+//            model.setContracttime(resultSet.getDate("contracttime"));
+//            model.setIsteamleader(resultSet.getString("isteamleader"));
+//            model.setDocumentno(resultSet.getString("documentno"));
+//            model.setHrcode(resultSet.getString("hrcode"));
+//            model.setRegulartm(resultSet.getDate("regulartm"));
+//            model.setIntime(resultSet.getDate("intime"));
+//            model.setSalarycode(resultSet.getString("salarycode"));
+//            model.setBirthday(resultSet.getDate("birthday"));
+//            model.setMarrycode(resultSet.getString("marrycode"));
+//            model.setStatus(resultSet.getString("status"));
+//            model.setWhichteam(resultSet.getString("whichteam"));
+//            model.setRemark(resultSet.getString("remark"));
+//
+//            return model;
+//        }
+//    }
+//
+//
+//    @Override
+//    public EsmUserInternal selectByPk(String id) {
+//        String sql = " select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  where id=? ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        List<EsmUserInternal> ls = jdbcTemplate.query(sql, new Object[]{id}, new EsmUserInternalRowMapper());
+//
+//        if (ls != null && ls.size() > 0) {
+//            return ls.get(0);
+//        }
+//
+//        return null;
+//    }
+//
+//
+//    @Override
+//    public List<EsmUserInternal> selectAll() {
+//        String sql = "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, new EsmUserInternalRowMapper());
+//    }
+//
+//
+//    public List<EsmUserInternal> selectList(String whereCase, Object[] paramValues) {
+//        String sql = "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  " + whereCase;
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.query(sql, paramValues, new EsmUserInternalRowMapper());
+//    }
+//
+//
+//    public Integer count(String whereCase, Object[] paramValues) {
+//        String sql = "select count(1) from esm_user_internal t " + whereCase;
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
+//    }
+//
+//
+//    public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
+//
+//        Dialect dialect = Dialect.guessDialect(dataSource);
+//        String sql = dialect.pagin(pageNumber, pageSize, "select t.id, t.addressnow, t.nations, t.politicalstatus, t.college, t.identity, t.education, t.bankname, t.accountno, t.addressresident, t.health, t.postalcode, t.phonehouse, t.collegetm, t.speciality, t.nativeplace, t.worktype, t.blood, t.saleno, t.orglast, t.joblast, t.hobby, t.namespecial, t.phonespecial, t.intimes, t.contracttime, t.isteamleader, t.documentno, t.hrcode, t.regulartm, t.intime, t.salarycode, t.birthday, t.marrycode, t.status, t.whichteam, t.remark from esm_user_internal t  " + whereCase);
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        List<EsmUserInternal> recordList = jdbcTemplate.query(sql, paramValues, new EsmUserInternalRowMapper());
+//
+//        int totalCount = count(whereCase, paramValues);
+//
+//        PageResult pageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
+//
+//        return pageResult;
+//    }
+//
+//
+//    @Override
+//    public Integer insert(EsmUserInternal model) {
+//
+//        String sql = "insert into esm_user_internal ( id, addressnow, nations, politicalstatus, college, identity, education, bankname, accountno, addressresident, health, postalcode, phonehouse, collegetm, speciality, nativeplace, worktype, blood, saleno, orglast, joblast, hobby, namespecial, phonespecial, intimes, contracttime, isteamleader, documentno, hrcode, regulartm, intime, salarycode, birthday, marrycode, status, whichteam, remark) values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = new Object[]{model.getId(), model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark()};
+//
+//        int out = jdbcTemplate.update(sql, params);
+//
+//        return out;
+//    }
+//
+//
+//    @Override
+//    public Integer insertSelective(EsmUserInternal model) {
+//
+//        StringBuffer sbSql = new StringBuffer();
+//        StringBuffer sbParams = new StringBuffer();
+//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
+//
+//        String pre = "";
+//
+//        if (model.getId() != null) {
+//            sbSql.append(pre + "id");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getId());
+//            pre = ",";
+//        }
+//        if (model.getAddressnow() != null) {
+//            sbSql.append(pre + "addressnow");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getAddressnow());
+//            pre = ",";
+//        }
+//        if (model.getNations() != null) {
+//            sbSql.append(pre + "nations");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getNations());
+//            pre = ",";
+//        }
+//        if (model.getPoliticalstatus() != null) {
+//            sbSql.append(pre + "politicalstatus");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPoliticalstatus());
+//            pre = ",";
+//        }
+//        if (model.getCollege() != null) {
+//            sbSql.append(pre + "college");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCollege());
+//            pre = ",";
+//        }
+//        if (model.getIdentity() != null) {
+//            sbSql.append(pre + "identity");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIdentity());
+//            pre = ",";
+//        }
+//        if (model.getEducation() != null) {
+//            sbSql.append(pre + "education");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getEducation());
+//            pre = ",";
+//        }
+//        if (model.getBankname() != null) {
+//            sbSql.append(pre + "bankname");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getBankname());
+//            pre = ",";
+//        }
+//        if (model.getAccountno() != null) {
+//            sbSql.append(pre + "accountno");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getAccountno());
+//            pre = ",";
+//        }
+//        if (model.getAddressresident() != null) {
+//            sbSql.append(pre + "addressresident");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getAddressresident());
+//            pre = ",";
+//        }
+//        if (model.getHealth() != null) {
+//            sbSql.append(pre + "health");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getHealth());
+//            pre = ",";
+//        }
+//        if (model.getPostalcode() != null) {
+//            sbSql.append(pre + "postalcode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPostalcode());
+//            pre = ",";
+//        }
+//        if (model.getPhonehouse() != null) {
+//            sbSql.append(pre + "phonehouse");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPhonehouse());
+//            pre = ",";
+//        }
+//        if (model.getCollegetm() != null) {
+//            sbSql.append(pre + "collegetm");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getCollegetm());
+//            pre = ",";
+//        }
+//        if (model.getSpeciality() != null) {
+//            sbSql.append(pre + "speciality");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getSpeciality());
+//            pre = ",";
+//        }
+//        if (model.getNativeplace() != null) {
+//            sbSql.append(pre + "nativeplace");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getNativeplace());
+//            pre = ",";
+//        }
+//        if (model.getWorktype() != null) {
+//            sbSql.append(pre + "worktype");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getWorktype());
+//            pre = ",";
+//        }
+//        if (model.getBlood() != null) {
+//            sbSql.append(pre + "blood");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getBlood());
+//            pre = ",";
+//        }
+//        if (model.getSaleno() != null) {
+//            sbSql.append(pre + "saleno");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getSaleno());
+//            pre = ",";
+//        }
+//        if (model.getOrglast() != null) {
+//            sbSql.append(pre + "orglast");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getOrglast());
+//            pre = ",";
+//        }
+//        if (model.getJoblast() != null) {
+//            sbSql.append(pre + "joblast");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getJoblast());
+//            pre = ",";
+//        }
+//        if (model.getHobby() != null) {
+//            sbSql.append(pre + "hobby");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getHobby());
+//            pre = ",";
+//        }
+//        if (model.getNamespecial() != null) {
+//            sbSql.append(pre + "namespecial");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getNamespecial());
+//            pre = ",";
+//        }
+//        if (model.getPhonespecial() != null) {
+//            sbSql.append(pre + "phonespecial");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getPhonespecial());
+//            pre = ",";
+//        }
+//        if (model.getIntimes() != null) {
+//            sbSql.append(pre + "intimes");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIntimes());
+//            pre = ",";
+//        }
+//        if (model.getContracttime() != null) {
+//            sbSql.append(pre + "contracttime");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getContracttime());
+//            pre = ",";
+//        }
+//        if (model.getIsteamleader() != null) {
+//            sbSql.append(pre + "isteamleader");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIsteamleader());
+//            pre = ",";
+//        }
+//        if (model.getDocumentno() != null) {
+//            sbSql.append(pre + "documentno");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getDocumentno());
+//            pre = ",";
+//        }
+//        if (model.getHrcode() != null) {
+//            sbSql.append(pre + "hrcode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getHrcode());
+//            pre = ",";
+//        }
+//        if (model.getRegulartm() != null) {
+//            sbSql.append(pre + "regulartm");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getRegulartm());
+//            pre = ",";
+//        }
+//        if (model.getIntime() != null) {
+//            sbSql.append(pre + "intime");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getIntime());
+//            pre = ",";
+//        }
+//        if (model.getSalarycode() != null) {
+//            sbSql.append(pre + "salarycode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getSalarycode());
+//            pre = ",";
+//        }
+//        if (model.getBirthday() != null) {
+//            sbSql.append(pre + "birthday");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getBirthday());
+//            pre = ",";
+//        }
+//        if (model.getMarrycode() != null) {
+//            sbSql.append(pre + "marrycode");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getMarrycode());
+//            pre = ",";
+//        }
+//        if (model.getStatus() != null) {
+//            sbSql.append(pre + "status");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getStatus());
+//            pre = ",";
+//        }
+//        if (model.getWhichteam() != null) {
+//            sbSql.append(pre + "whichteam");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getWhichteam());
+//            pre = ",";
+//        }
+//        if (model.getRemark() != null) {
+//            sbSql.append(pre + "remark");
+//            sbParams.append(pre + "?");
+//            alParamsValues.add(model.getRemark());
+//            pre = ",";
+//        }
+//
+//
+//        String sql = "INSERT INTO esm_user_internal (" + sbSql.toString() + ") VALUES (" + sbParams.toString() + ")";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = alParamsValues.toArray();
+//
+//        int out = jdbcTemplate.update(sql, params);
+//
+//        return out;
+//    }
+//
+//
+//    @Override
+//    public Integer update(EsmUserInternal model) {
+//
+//        String sql = "update esm_user_internal set addressnow=?, nations=?, politicalstatus=?, college=?, identity=?, education=?, bankname=?, accountno=?, addressresident=?, health=?, postalcode=?, phonehouse=?, collegetm=?, speciality=?, nativeplace=?, worktype=?, blood=?, saleno=?, orglast=?, joblast=?, hobby=?, namespecial=?, phonespecial=?, intimes=?, contracttime=?, isteamleader=?, documentno=?, hrcode=?, regulartm=?, intime=?, salarycode=?, birthday=?, marrycode=?, status=?, whichteam=?, remark=? where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        Object[] params = new Object[]{model.getAddressnow(), model.getNations(), model.getPoliticalstatus(), model.getCollege(), model.getIdentity(), model.getEducation(), model.getBankname(), model.getAccountno(), model.getAddressresident(), model.getHealth(), model.getPostalcode(), model.getPhonehouse(), model.getCollegetm(), model.getSpeciality(), model.getNativeplace(), model.getWorktype(), model.getBlood(), model.getSaleno(), model.getOrglast(), model.getJoblast(), model.getHobby(), model.getNamespecial(), model.getPhonespecial(), model.getIntimes(), model.getContracttime(), model.getIsteamleader(), model.getDocumentno(), model.getHrcode(), model.getRegulartm(), model.getIntime(), model.getSalarycode(), model.getBirthday(), model.getMarrycode(), model.getStatus(), model.getWhichteam(), model.getRemark(), model.getId()};
+//
+//        return jdbcTemplate.update(sql, params);
+//    }
+//
+//
+//    @Override
+//    public Integer updateSelective(EsmUserInternal model) {
+//
+//        StringBuffer sbSql = new StringBuffer();
+//        StringBuffer sbParams = new StringBuffer();
+//        ArrayList<Object> alParamsValues = new ArrayList<Object>();
+//
+//        String pre = "";
+//        String preWhere = "";
+//
+//        if (model.getAddressnow() != null) {
+//            sbSql.append(pre + "addressnow=?");
+//            alParamsValues.add(model.getAddressnow());
+//            pre = ",";
+//        }
+//        if (model.getNations() != null) {
+//            sbSql.append(pre + "nations=?");
+//            alParamsValues.add(model.getNations());
+//            pre = ",";
+//        }
+//        if (model.getPoliticalstatus() != null) {
+//            sbSql.append(pre + "politicalstatus=?");
+//            alParamsValues.add(model.getPoliticalstatus());
+//            pre = ",";
+//        }
+//        if (model.getCollege() != null) {
+//            sbSql.append(pre + "college=?");
+//            alParamsValues.add(model.getCollege());
+//            pre = ",";
+//        }
+//        if (model.getIdentity() != null) {
+//            sbSql.append(pre + "identity=?");
+//            alParamsValues.add(model.getIdentity());
+//            pre = ",";
+//        }
+//        if (model.getEducation() != null) {
+//            sbSql.append(pre + "education=?");
+//            alParamsValues.add(model.getEducation());
+//            pre = ",";
+//        }
+//        if (model.getBankname() != null) {
+//            sbSql.append(pre + "bankname=?");
+//            alParamsValues.add(model.getBankname());
+//            pre = ",";
+//        }
+//        if (model.getAccountno() != null) {
+//            sbSql.append(pre + "accountno=?");
+//            alParamsValues.add(model.getAccountno());
+//            pre = ",";
+//        }
+//        if (model.getAddressresident() != null) {
+//            sbSql.append(pre + "addressresident=?");
+//            alParamsValues.add(model.getAddressresident());
+//            pre = ",";
+//        }
+//        if (model.getHealth() != null) {
+//            sbSql.append(pre + "health=?");
+//            alParamsValues.add(model.getHealth());
+//            pre = ",";
+//        }
+//        if (model.getPostalcode() != null) {
+//            sbSql.append(pre + "postalcode=?");
+//            alParamsValues.add(model.getPostalcode());
+//            pre = ",";
+//        }
+//        if (model.getPhonehouse() != null) {
+//            sbSql.append(pre + "phonehouse=?");
+//            alParamsValues.add(model.getPhonehouse());
+//            pre = ",";
+//        }
+//        if (model.getCollegetm() != null) {
+//            sbSql.append(pre + "collegetm=?");
+//            alParamsValues.add(model.getCollegetm());
+//            pre = ",";
+//        }
+//        if (model.getSpeciality() != null) {
+//            sbSql.append(pre + "speciality=?");
+//            alParamsValues.add(model.getSpeciality());
+//            pre = ",";
+//        }
+//        if (model.getNativeplace() != null) {
+//            sbSql.append(pre + "nativeplace=?");
+//            alParamsValues.add(model.getNativeplace());
+//            pre = ",";
+//        }
+//        if (model.getWorktype() != null) {
+//            sbSql.append(pre + "worktype=?");
+//            alParamsValues.add(model.getWorktype());
+//            pre = ",";
+//        }
+//        if (model.getBlood() != null) {
+//            sbSql.append(pre + "blood=?");
+//            alParamsValues.add(model.getBlood());
+//            pre = ",";
+//        }
+//        if (model.getSaleno() != null) {
+//            sbSql.append(pre + "saleno=?");
+//            alParamsValues.add(model.getSaleno());
+//            pre = ",";
+//        }
+//        if (model.getOrglast() != null) {
+//            sbSql.append(pre + "orglast=?");
+//            alParamsValues.add(model.getOrglast());
+//            pre = ",";
+//        }
+//        if (model.getJoblast() != null) {
+//            sbSql.append(pre + "joblast=?");
+//            alParamsValues.add(model.getJoblast());
+//            pre = ",";
+//        }
+//        if (model.getHobby() != null) {
+//            sbSql.append(pre + "hobby=?");
+//            alParamsValues.add(model.getHobby());
+//            pre = ",";
+//        }
+//        if (model.getNamespecial() != null) {
+//            sbSql.append(pre + "namespecial=?");
+//            alParamsValues.add(model.getNamespecial());
+//            pre = ",";
+//        }
+//        if (model.getPhonespecial() != null) {
+//            sbSql.append(pre + "phonespecial=?");
+//            alParamsValues.add(model.getPhonespecial());
+//            pre = ",";
+//        }
+//        if (model.getIntimes() != null) {
+//            sbSql.append(pre + "intimes=?");
+//            alParamsValues.add(model.getIntimes());
+//            pre = ",";
+//        }
+//        if (model.getContracttime() != null) {
+//            sbSql.append(pre + "contracttime=?");
+//            alParamsValues.add(model.getContracttime());
+//            pre = ",";
+//        }
+//        if (model.getIsteamleader() != null) {
+//            sbSql.append(pre + "isteamleader=?");
+//            alParamsValues.add(model.getIsteamleader());
+//            pre = ",";
+//        }
+//        if (model.getDocumentno() != null) {
+//            sbSql.append(pre + "documentno=?");
+//            alParamsValues.add(model.getDocumentno());
+//            pre = ",";
+//        }
+//        if (model.getHrcode() != null) {
+//            sbSql.append(pre + "hrcode=?");
+//            alParamsValues.add(model.getHrcode());
+//            pre = ",";
+//        }
+//        if (model.getRegulartm() != null) {
+//            sbSql.append(pre + "regulartm=?");
+//            alParamsValues.add(model.getRegulartm());
+//            pre = ",";
+//        }
+//        if (model.getIntime() != null) {
+//            sbSql.append(pre + "intime=?");
+//            alParamsValues.add(model.getIntime());
+//            pre = ",";
+//        }
+//        if (model.getSalarycode() != null) {
+//            sbSql.append(pre + "salarycode=?");
+//            alParamsValues.add(model.getSalarycode());
+//            pre = ",";
+//        }
+//        if (model.getBirthday() != null) {
+//            sbSql.append(pre + "birthday=?");
+//            alParamsValues.add(model.getBirthday());
+//            pre = ",";
+//        }
+//        if (model.getMarrycode() != null) {
+//            sbSql.append(pre + "marrycode=?");
+//            alParamsValues.add(model.getMarrycode());
+//            pre = ",";
+//        }
+//        if (model.getStatus() != null) {
+//            sbSql.append(pre + "status=?");
+//            alParamsValues.add(model.getStatus());
+//            pre = ",";
+//        }
+//        if (model.getWhichteam() != null) {
+//            sbSql.append(pre + "whichteam=?");
+//            alParamsValues.add(model.getWhichteam());
+//            pre = ",";
+//        }
+//        if (model.getRemark() != null) {
+//            sbSql.append(pre + "remark=?");
+//            alParamsValues.add(model.getRemark());
+//            pre = ",";
+//        }
+//        if (model.getId() != null) {
+//            sbParams.append(preWhere + "id=?");
+//            alParamsValues.add(model.getId());
+//            preWhere = ",";
+//        }
+//
+//
+//        if (!sbSql.toString().equalsIgnoreCase("")) {
+//            String sql = "update esm_user_internal set " + sbSql.toString() + " where " + sbParams.toString();
+//
+//            JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//            Object[] params = alParamsValues.toArray();
+//
+//            return jdbcTemplate.update(sql, params);
+//        }
+//
+//        return 0;
+//
+//    }
+//
+//
+//    @Override
+//    public Integer delete(String id) {
+//
+//        String sql = "delete from esm_user_internal where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.update(sql, id);
+//    }
+//
+//
+//    @Override
+//    public Integer delete(List<EsmUserInternal> lsEsmUserInternal) {
+//        String sql = "delete from esm_user_internal where id=?";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        return jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+//            @Override
+//            public void setValues(PreparedStatement preparedStatement, int i) throws SQLException {
+//                preparedStatement.setString(1, lsEsmUserInternal.get(i).getId());
+//            }
+//
+//            @Override
+//            public int getBatchSize() {
+//                return lsEsmUserInternal.size();
+//            }
+//        }).length;
+//    }
+//
+//}

src/main/java/com/ydtech/modules/esm/model/EsmUserInternal.java

@@ -1,66 +1,66 @@
-package com.ydtech.modules.esm.model;
-
-import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-@TableName(value = "esm_user_internal")
-@Data
-@ApiModel
-public class EsmUserInternal implements Serializable {
-
-    private static final long serialVersionUID = 5053893395186078389L;
-
-    @TableId(value = "id")
-    private String id;
-    private String addressnow;
-    private String nations;
-    private String politicalstatus;
-    private String college;
-    private String identity;
-    private String education;
-    private String bankname;
-    private String accountno;
-    private String addressresident;
-    private String health;
-    private String postalcode;
-    private String phonehouse;
-    private Date collegetm;
-    private String speciality;
-    private String nativeplace;
-    private String worktype;
-    private String blood;
-    private String saleno;
-    private String orglast;
-    private String joblast;
-    private String hobby;
-    private String namespecial;
-    private String phonespecial;
-    private String intimes;
-    private Date contracttime;
-    private String isteamleader;
-    private String documentno;
-    private String hrcode;
-    private Date regulartm;
-    private Date intime;
-    private String salarycode;
-    private Date birthday;
-    private String marrycode;
-    private String status;
-    private String whichteam;
-    private String remark;
-
-
-
-
-
-
-}
+//package com.ydtech.modules.esm.model;
+//
+//import cn.afterturn.easypoi.excel.annotation.Excel;
+//import com.baomidou.mybatisplus.annotation.TableField;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import io.swagger.annotations.ApiModel;
+//import io.swagger.annotations.ApiModelProperty;
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.util.Date;
+//
+//
+//@TableName(value = "esm_user_internal")
+//@Data
+//@ApiModel
+//public class EsmUserInternal implements Serializable {
+//
+//    private static final long serialVersionUID = 5053893395186078389L;
+//
+//    @TableId(value = "id")
+//    private String id;
+//    private String addressnow;
+//    private String nations;
+//    private String politicalstatus;
+//    private String college;
+//    private String identity;
+//    private String education;
+//    private String bankname;
+//    private String accountno;
+//    private String addressresident;
+//    private String health;
+//    private String postalcode;
+//    private String phonehouse;
+//    private Date collegetm;
+//    private String speciality;
+//    private String nativeplace;
+//    private String worktype;
+//    private String blood;
+//    private String saleno;
+//    private String orglast;
+//    private String joblast;
+//    private String hobby;
+//    private String namespecial;
+//    private String phonespecial;
+//    private String intimes;
+//    private Date contracttime;
+//    private String isteamleader;
+//    private String documentno;
+//    private String hrcode;
+//    private Date regulartm;
+//    private Date intime;
+//    private String salarycode;
+//    private Date birthday;
+//    private String marrycode;
+//    private String status;
+//    private String whichteam;
+//    private String remark;
+//
+//
+//
+//
+//
+//
+//}

src/main/java/com/ydtech/modules/esm/model/EsmUserInternalCheck.java

@@ -1,355 +1,355 @@
-package com.ydtech.modules.esm.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-public class EsmUserInternalCheck implements Serializable {
-
-    private static final long serialVersionUID = 5086594541373584430L;
-
-    private String checkid;
-    private String id;
-    private String addressnow;
-    private String nations;
-    private String politicalstatus;
-    private String college;
-    private String identity;
-    private String education;
-    private String bankname;
-    private String accountno;
-    private String addressresident;
-    private String health;
-    private String postalcode;
-    private String phonehouse;
-    private Date collegetm;
-    private String speciality;
-    private String nativeplace;
-    private String worktype;
-    private String blood;
-    private String saleno;
-    private String orglast;
-    private String joblast;
-    private String hobby;
-    private String namespecial;
-    private String phonespecial;
-    private String intimes;
-    private Date contracttime;
-    private String isteamleader;
-    private String documentno;
-    private String hrcode;
-    private Date regulartm;
-    private Date intime;
-    private String salarycode;
-    private Date birthday;
-    private String marrycode;
-    private String status;
-    private String whichteam;
-    private String remark;
-
-    public String getCheckid() {
-        return checkid;
-    }
-
-    public void setCheckid(String checkid) {
-        this.checkid = checkid;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAddressnow() {
-        return addressnow;
-    }
-
-    public void setAddressnow(String addressnow) {
-        this.addressnow = addressnow;
-    }
-
-    public String getNations() {
-        return nations;
-    }
-
-    public void setNations(String nations) {
-        this.nations = nations;
-    }
-
-    public String getPoliticalstatus() {
-        return politicalstatus;
-    }
-
-    public void setPoliticalstatus(String politicalstatus) {
-        this.politicalstatus = politicalstatus;
-    }
-
-    public String getCollege() {
-        return college;
-    }
-
-    public void setCollege(String college) {
-        this.college = college;
-    }
-
-    public String getIdentity() {
-        return identity;
-    }
-
-    public void setIdentity(String identity) {
-        this.identity = identity;
-    }
-
-    public String getEducation() {
-        return education;
-    }
-
-    public void setEducation(String education) {
-        this.education = education;
-    }
-
-    public String getBankname() {
-        return bankname;
-    }
-
-    public void setBankname(String bankname) {
-        this.bankname = bankname;
-    }
-
-    public String getAccountno() {
-        return accountno;
-    }
-
-    public void setAccountno(String accountno) {
-        this.accountno = accountno;
-    }
-
-    public String getAddressresident() {
-        return addressresident;
-    }
-
-    public void setAddressresident(String addressresident) {
-        this.addressresident = addressresident;
-    }
-
-    public String getHealth() {
-        return health;
-    }
-
-    public void setHealth(String health) {
-        this.health = health;
-    }
-
-    public String getPostalcode() {
-        return postalcode;
-    }
-
-    public void setPostalcode(String postalcode) {
-        this.postalcode = postalcode;
-    }
-
-    public String getPhonehouse() {
-        return phonehouse;
-    }
-
-    public void setPhonehouse(String phonehouse) {
-        this.phonehouse = phonehouse;
-    }
-
-    public Date getCollegetm() {
-        return collegetm;
-    }
-
-    public void setCollegetm(Date collegetm) {
-        this.collegetm = collegetm;
-    }
-
-    public String getSpeciality() {
-        return speciality;
-    }
-
-    public void setSpeciality(String speciality) {
-        this.speciality = speciality;
-    }
-
-    public String getNativeplace() {
-        return nativeplace;
-    }
-
-    public void setNativeplace(String nativeplace) {
-        this.nativeplace = nativeplace;
-    }
-
-    public String getWorktype() {
-        return worktype;
-    }
-
-    public void setWorktype(String worktype) {
-        this.worktype = worktype;
-    }
-
-    public String getBlood() {
-        return blood;
-    }
-
-    public void setBlood(String blood) {
-        this.blood = blood;
-    }
-
-    public String getSaleno() {
-        return saleno;
-    }
-
-    public void setSaleno(String saleno) {
-        this.saleno = saleno;
-    }
-
-    public String getOrglast() {
-        return orglast;
-    }
-
-    public void setOrglast(String orglast) {
-        this.orglast = orglast;
-    }
-
-    public String getJoblast() {
-        return joblast;
-    }
-
-    public void setJoblast(String joblast) {
-        this.joblast = joblast;
-    }
-
-    public String getHobby() {
-        return hobby;
-    }
-
-    public void setHobby(String hobby) {
-        this.hobby = hobby;
-    }
-
-    public String getNamespecial() {
-        return namespecial;
-    }
-
-    public void setNamespecial(String namespecial) {
-        this.namespecial = namespecial;
-    }
-
-    public String getPhonespecial() {
-        return phonespecial;
-    }
-
-    public void setPhonespecial(String phonespecial) {
-        this.phonespecial = phonespecial;
-    }
-
-    public String getIntimes() {
-        return intimes;
-    }
-
-    public void setIntimes(String intimes) {
-        this.intimes = intimes;
-    }
-
-    public Date getContracttime() {
-        return contracttime;
-    }
-
-    public void setContracttime(Date contracttime) {
-        this.contracttime = contracttime;
-    }
-
-    public String getIsteamleader() {
-        return isteamleader;
-    }
-
-    public void setIsteamleader(String isteamleader) {
-        this.isteamleader = isteamleader;
-    }
-
-    public String getDocumentno() {
-        return documentno;
-    }
-
-    public void setDocumentno(String documentno) {
-        this.documentno = documentno;
-    }
-
-    public String getHrcode() {
-        return hrcode;
-    }
-
-    public void setHrcode(String hrcode) {
-        this.hrcode = hrcode;
-    }
-
-    public Date getRegulartm() {
-        return regulartm;
-    }
-
-    public void setRegulartm(Date regulartm) {
-        this.regulartm = regulartm;
-    }
-
-    public Date getIntime() {
-        return intime;
-    }
-
-    public void setIntime(Date intime) {
-        this.intime = intime;
-    }
-
-    public String getSalarycode() {
-        return salarycode;
-    }
-
-    public void setSalarycode(String salarycode) {
-        this.salarycode = salarycode;
-    }
-
-    public Date getBirthday() {
-        return birthday;
-    }
-
-    public void setBirthday(Date birthday) {
-        this.birthday = birthday;
-    }
-
-    public String getMarrycode() {
-        return marrycode;
-    }
-
-    public void setMarrycode(String marrycode) {
-        this.marrycode = marrycode;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getWhichteam() {
-        return whichteam;
-    }
-
-    public void setWhichteam(String whichteam) {
-        this.whichteam = whichteam;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-
-}
+//package com.ydtech.modules.esm.model;
+//
+//import java.io.Serializable;
+//import java.util.Date;
+//
+//
+//public class EsmUserInternalCheck implements Serializable {
+//
+//    private static final long serialVersionUID = 5086594541373584430L;
+//
+//    private String checkid;
+//    private String id;
+//    private String addressnow;
+//    private String nations;
+//    private String politicalstatus;
+//    private String college;
+//    private String identity;
+//    private String education;
+//    private String bankname;
+//    private String accountno;
+//    private String addressresident;
+//    private String health;
+//    private String postalcode;
+//    private String phonehouse;
+//    private Date collegetm;
+//    private String speciality;
+//    private String nativeplace;
+//    private String worktype;
+//    private String blood;
+//    private String saleno;
+//    private String orglast;
+//    private String joblast;
+//    private String hobby;
+//    private String namespecial;
+//    private String phonespecial;
+//    private String intimes;
+//    private Date contracttime;
+//    private String isteamleader;
+//    private String documentno;
+//    private String hrcode;
+//    private Date regulartm;
+//    private Date intime;
+//    private String salarycode;
+//    private Date birthday;
+//    private String marrycode;
+//    private String status;
+//    private String whichteam;
+//    private String remark;
+//
+//    public String getCheckid() {
+//        return checkid;
+//    }
+//
+//    public void setCheckid(String checkid) {
+//        this.checkid = checkid;
+//    }
+//
+//    public String getId() {
+//        return id;
+//    }
+//
+//    public void setId(String id) {
+//        this.id = id;
+//    }
+//
+//    public String getAddressnow() {
+//        return addressnow;
+//    }
+//
+//    public void setAddressnow(String addressnow) {
+//        this.addressnow = addressnow;
+//    }
+//
+//    public String getNations() {
+//        return nations;
+//    }
+//
+//    public void setNations(String nations) {
+//        this.nations = nations;
+//    }
+//
+//    public String getPoliticalstatus() {
+//        return politicalstatus;
+//    }
+//
+//    public void setPoliticalstatus(String politicalstatus) {
+//        this.politicalstatus = politicalstatus;
+//    }
+//
+//    public String getCollege() {
+//        return college;
+//    }
+//
+//    public void setCollege(String college) {
+//        this.college = college;
+//    }
+//
+//    public String getIdentity() {
+//        return identity;
+//    }
+//
+//    public void setIdentity(String identity) {
+//        this.identity = identity;
+//    }
+//
+//    public String getEducation() {
+//        return education;
+//    }
+//
+//    public void setEducation(String education) {
+//        this.education = education;
+//    }
+//
+//    public String getBankname() {
+//        return bankname;
+//    }
+//
+//    public void setBankname(String bankname) {
+//        this.bankname = bankname;
+//    }
+//
+//    public String getAccountno() {
+//        return accountno;
+//    }
+//
+//    public void setAccountno(String accountno) {
+//        this.accountno = accountno;
+//    }
+//
+//    public String getAddressresident() {
+//        return addressresident;
+//    }
+//
+//    public void setAddressresident(String addressresident) {
+//        this.addressresident = addressresident;
+//    }
+//
+//    public String getHealth() {
+//        return health;
+//    }
+//
+//    public void setHealth(String health) {
+//        this.health = health;
+//    }
+//
+//    public String getPostalcode() {
+//        return postalcode;
+//    }
+//
+//    public void setPostalcode(String postalcode) {
+//        this.postalcode = postalcode;
+//    }
+//
+//    public String getPhonehouse() {
+//        return phonehouse;
+//    }
+//
+//    public void setPhonehouse(String phonehouse) {
+//        this.phonehouse = phonehouse;
+//    }
+//
+//    public Date getCollegetm() {
+//        return collegetm;
+//    }
+//
+//    public void setCollegetm(Date collegetm) {
+//        this.collegetm = collegetm;
+//    }
+//
+//    public String getSpeciality() {
+//        return speciality;
+//    }
+//
+//    public void setSpeciality(String speciality) {
+//        this.speciality = speciality;
+//    }
+//
+//    public String getNativeplace() {
+//        return nativeplace;
+//    }
+//
+//    public void setNativeplace(String nativeplace) {
+//        this.nativeplace = nativeplace;
+//    }
+//
+//    public String getWorktype() {
+//        return worktype;
+//    }
+//
+//    public void setWorktype(String worktype) {
+//        this.worktype = worktype;
+//    }
+//
+//    public String getBlood() {
+//        return blood;
+//    }
+//
+//    public void setBlood(String blood) {
+//        this.blood = blood;
+//    }
+//
+//    public String getSaleno() {
+//        return saleno;
+//    }
+//
+//    public void setSaleno(String saleno) {
+//        this.saleno = saleno;
+//    }
+//
+//    public String getOrglast() {
+//        return orglast;
+//    }
+//
+//    public void setOrglast(String orglast) {
+//        this.orglast = orglast;
+//    }
+//
+//    public String getJoblast() {
+//        return joblast;
+//    }
+//
+//    public void setJoblast(String joblast) {
+//        this.joblast = joblast;
+//    }
+//
+//    public String getHobby() {
+//        return hobby;
+//    }
+//
+//    public void setHobby(String hobby) {
+//        this.hobby = hobby;
+//    }
+//
+//    public String getNamespecial() {
+//        return namespecial;
+//    }
+//
+//    public void setNamespecial(String namespecial) {
+//        this.namespecial = namespecial;
+//    }
+//
+//    public String getPhonespecial() {
+//        return phonespecial;
+//    }
+//
+//    public void setPhonespecial(String phonespecial) {
+//        this.phonespecial = phonespecial;
+//    }
+//
+//    public String getIntimes() {
+//        return intimes;
+//    }
+//
+//    public void setIntimes(String intimes) {
+//        this.intimes = intimes;
+//    }
+//
+//    public Date getContracttime() {
+//        return contracttime;
+//    }
+//
+//    public void setContracttime(Date contracttime) {
+//        this.contracttime = contracttime;
+//    }
+//
+//    public String getIsteamleader() {
+//        return isteamleader;
+//    }
+//
+//    public void setIsteamleader(String isteamleader) {
+//        this.isteamleader = isteamleader;
+//    }
+//
+//    public String getDocumentno() {
+//        return documentno;
+//    }
+//
+//    public void setDocumentno(String documentno) {
+//        this.documentno = documentno;
+//    }
+//
+//    public String getHrcode() {
+//        return hrcode;
+//    }
+//
+//    public void setHrcode(String hrcode) {
+//        this.hrcode = hrcode;
+//    }
+//
+//    public Date getRegulartm() {
+//        return regulartm;
+//    }
+//
+//    public void setRegulartm(Date regulartm) {
+//        this.regulartm = regulartm;
+//    }
+//
+//    public Date getIntime() {
+//        return intime;
+//    }
+//
+//    public void setIntime(Date intime) {
+//        this.intime = intime;
+//    }
+//
+//    public String getSalarycode() {
+//        return salarycode;
+//    }
+//
+//    public void setSalarycode(String salarycode) {
+//        this.salarycode = salarycode;
+//    }
+//
+//    public Date getBirthday() {
+//        return birthday;
+//    }
+//
+//    public void setBirthday(Date birthday) {
+//        this.birthday = birthday;
+//    }
+//
+//    public String getMarrycode() {
+//        return marrycode;
+//    }
+//
+//    public void setMarrycode(String marrycode) {
+//        this.marrycode = marrycode;
+//    }
+//
+//    public String getStatus() {
+//        return status;
+//    }
+//
+//    public void setStatus(String status) {
+//        this.status = status;
+//    }
+//
+//    public String getWhichteam() {
+//        return whichteam;
+//    }
+//
+//    public void setWhichteam(String whichteam) {
+//        this.whichteam = whichteam;
+//    }
+//
+//    public String getRemark() {
+//        return remark;
+//    }
+//
+//    public void setRemark(String remark) {
+//        this.remark = remark;
+//    }
+//
+//
+//}

src/main/java/com/ydtech/modules/esm/model/EsmUserReferrer.java

@@ -31,6 +31,15 @@ public class EsmUserReferrer implements Serializable {
     @TableField(value = "level")
     private int level;
 
+    /**
+     *  推荐人归属ID
+     *
+     * @author: lig
+     * @date: 2023年08月08日 0008
+     */
+    @TableField(value = "affiliation")
+
+    private String affiliation;
 
 
 }

src/main/java/com/ydtech/modules/esm/model/vo/EsmUserInternalVo.java

@@ -1,87 +1,87 @@
-package com.ydtech.modules.esm.model.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class EsmUserInternalVo implements Serializable {
-    /**
-     *
-     */
-    private String id;
-    /**
-     * 姓名
-     */
-    private String name;
-    /**
-     * 性别
-     */
-    private String sex;
-    /**
-     * 出生日期
-     */
-    private Date birthday;
-    /**
-     * 户口地址
-     */
-    private String addressresident;
-    /**
-     * 邮箱
-     */
-    private String email;
-    /**
-     * 身份证号
-     */
-    private String identity;
-    /**
-     * 毕业院校
-     */
-    private String college;
-    /**
-     * 开户账号
-     */
-    private String accountno;
-    /**
-     * 开户行
-     */
-    private String bankname;
-    /**
-     * 紧急联系人姓名
-     */
-    private String namespecial;
-    /**
-     * 紧急联系人电话
-     */
-    private String phonespecial;
-    /**
-     * 婚姻状况
-     */
-    private String marrycode;
-    /**
-     * 血型
-     */
-    private String blood;
-    /**
-     * 学历
-     */
-    private String education;
-    /**
-     * 居住地址
-     */
-    private String addressnow;
-    /**
-     * 民族
-     */
-    private String nations;
-    /**
-     * 政治面貌
-     */
-    private String politicalstatus;
-
-
-    private static final long serialVersionUID = 1L;
-
-
-}
+//package com.ydtech.modules.esm.model.vo;
+//
+//import lombok.Data;
+//
+//import java.io.Serializable;
+//import java.util.Date;
+//
+//@Data
+//public class EsmUserInternalVo implements Serializable {
+//    /**
+//     *
+//     */
+//    private String id;
+//    /**
+//     * 姓名
+//     */
+//    private String name;
+//    /**
+//     * 性别
+//     */
+//    private String sex;
+//    /**
+//     * 出生日期
+//     */
+//    private Date birthday;
+//    /**
+//     * 户口地址
+//     */
+//    private String addressresident;
+//    /**
+//     * 邮箱
+//     */
+//    private String email;
+//    /**
+//     * 身份证号
+//     */
+//    private String identity;
+//    /**
+//     * 毕业院校
+//     */
+//    private String college;
+//    /**
+//     * 开户账号
+//     */
+//    private String accountno;
+//    /**
+//     * 开户行
+//     */
+//    private String bankname;
+//    /**
+//     * 紧急联系人姓名
+//     */
+//    private String namespecial;
+//    /**
+//     * 紧急联系人电话
+//     */
+//    private String phonespecial;
+//    /**
+//     * 婚姻状况
+//     */
+//    private String marrycode;
+//    /**
+//     * 血型
+//     */
+//    private String blood;
+//    /**
+//     * 学历
+//     */
+//    private String education;
+//    /**
+//     * 居住地址
+//     */
+//    private String addressnow;
+//    /**
+//     * 民族
+//     */
+//    private String nations;
+//    /**
+//     * 政治面貌
+//     */
+//    private String politicalstatus;
+//
+//
+//    private static final long serialVersionUID = 1L;
+//
+//
+//}

src/main/java/com/ydtech/modules/esm/service/EsmUserInternalService.java

@@ -1,30 +1,30 @@
-package com.ydtech.modules.esm.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.PageResult;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.esm.model.EsmUserInternal;
-
-import java.util.List;
-
-public interface EsmUserInternalService extends IService<EsmUserInternal> {
-//public interface EsmUserInternalService extends EsmUserInternalDao {
-
-//    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
-
-    //替换为sysUserService里
-//    public String findMaxId(String deptId);
-
-//    public int queryTempNum(String deptId);
-
-//    public List<String> queryTeamUser(String id);
-
-    public Integer check(String id, String status);
-
-    public List<SysUser> getSuperior(String id);
-
-}
-
-
-
+//package com.ydtech.modules.esm.service;
+//
+//
+//import com.baomidou.mybatisplus.extension.service.IService;
+//import com.ydtech.core.page.PageResult;
+//import com.ydtech.modules.admin.model.SysUser;
+//import com.ydtech.modules.esm.model.EsmUserInternal;
+//
+//import java.util.List;
+//
+//public interface EsmUserInternalService extends IService<EsmUserInternal> {
+////public interface EsmUserInternalService extends EsmUserInternalDao {
+//
+////    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues);
+//
+//    //替换为sysUserService里
+////    public String findMaxId(String deptId);
+//
+////    public int queryTempNum(String deptId);
+//
+////    public List<String> queryTeamUser(String id);
+//
+//    public Integer check(String id, String status);
+//
+//    public List<SysUser> getSuperior(String id);
+//
+//}
+//
+//
+//

src/main/java/com/ydtech/modules/esm/service/EsmUserReferrerService.java

@@ -3,6 +3,9 @@ package com.ydtech.modules.esm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.vo.SysReferrerVo;
+import com.ydtech.modules.base.model.dto.PageDto;
+import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 
 import java.util.List;
@@ -16,6 +19,26 @@ public interface EsmUserReferrerService extends IService<EsmUserReferrer> {
     boolean deldeleteByReferrerId(String userId);
     void buildLevelList(SysUser user,List<SysUser> oneList,List<SysUser> oneTempList);
 
+
+    /**
+     *  添加推荐人
+     * @param referrerId    推荐人ID
+     * @param nextPK        添加的用户ID
+     *
+     * @author: lig
+     * @date: 2023年08月08日 0008
+     */
+    void addReferrer(String referrerId,String nextPK);
+
+
+    /**
+     *  获取代理人分页
+     *
+     * @author: lig
+     * @date: 2023年08月08日 0008
+     */
+    public PageVo<SysReferrerVo> gainReferrerPage(PageDto pageDto);
+
 }
 
 

src/main/java/com/ydtech/modules/esm/service/impl/EsmSalaryServiceImpl.java

@@ -11,7 +11,6 @@ import com.ydtech.modules.esm.dao.EsmSalaryMapper;
 import com.ydtech.modules.esm.model.EsmSalary;
 import com.ydtech.modules.esm.model.EsmSalaryCheck;
 import com.ydtech.modules.esm.service.EsmSalaryService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.esm.model.vo.EsmSalaryQueryVO;
 import com.ydtech.modules.esm.model.vo.req.ReqVo;
 import com.ydtech.modules.esm.model.vo.res.EsmSalaryCheckRes;
@@ -44,8 +43,6 @@ public class EsmSalaryServiceImpl implements EsmSalaryService {
     private EsmSalaryCheckMapper esmSalaryCheckMapper;
     @Autowired
     private SysUserService sysUserService;
-    @Autowired
-    private EsmUserInternalService esmUserInternalService;
 
     /**
      * @author: shenweidong

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserInternalServiceImpl.java

@@ -1,364 +1,364 @@
-package com.ydtech.modules.esm.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.esm.dao.EsmUserInternalMapper;
-import com.ydtech.modules.esm.model.EsmUserInternal;
-import com.ydtech.modules.esm.service.EsmUserAgentService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
-import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
-import com.ydtech.modules.esm.model.vo.TeamUserVONew;
-import com.ydtech.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-
-@Service
-public class EsmUserInternalServiceImpl extends ServiceImpl<EsmUserInternalMapper, EsmUserInternal>
-        implements EsmUserInternalService  {
-//public class EsmUserInternalServiceImpl extends EsmUserInternalDaoImpl
-//        implements EsmUserInternalService {
-
-    @Autowired
-    EsmUserAgentService esmUserAgentService;
-    @Autowired
-    SysUserService sysUserService;
-
-
-    //人员审核
-    public Integer check(String id, String status) {
-        LambdaUpdateWrapper<EsmUserInternal> luw = new LambdaUpdateWrapper();
-        luw.set(EsmUserInternal::getStatus,status);
-        luw.eq(EsmUserInternal::getId,id);
-        return update(luw) == true ?1:0;
-    }
+//package com.ydtech.modules.esm.service.impl;
+//
+//import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+//import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+//import com.ydtech.modules.admin.model.SysUser;
+//import com.ydtech.modules.admin.service.SysUserService;
+//import com.ydtech.modules.esm.dao.EsmUserInternalMapper;
+//import com.ydtech.modules.esm.model.EsmUserInternal;
+//import com.ydtech.modules.esm.service.EsmUserAgentService;
+//import com.ydtech.modules.esm.service.EsmUserInternalService;
+//import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
+//import com.ydtech.modules.esm.model.vo.TeamUserVONew;
+//import com.ydtech.utils.StringUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.Serializable;
+//import java.util.ArrayList;
+//import java.util.Date;
+//import java.util.List;
+//
+//
+//@Service
+//public class EsmUserInternalServiceImpl extends ServiceImpl<EsmUserInternalMapper, EsmUserInternal>
+//        implements EsmUserInternalService  {
+////public class EsmUserInternalServiceImpl extends EsmUserInternalDaoImpl
+////        implements EsmUserInternalService {
+//
+//    @Autowired
+//    EsmUserAgentService esmUserAgentService;
+//    @Autowired
+//    SysUserService sysUserService;
+//
+//
 //    //人员审核
 //    public Integer check(String id, String status) {
-//        String sql = " update esm_user_internal set status=? where id=? ";
+//        LambdaUpdateWrapper<EsmUserInternal> luw = new LambdaUpdateWrapper();
+//        luw.set(EsmUserInternal::getStatus,status);
+//        luw.eq(EsmUserInternal::getId,id);
+//        return update(luw) == true ?1:0;
+//    }
+////    //人员审核
+////    public Integer check(String id, String status) {
+////        String sql = " update esm_user_internal set status=? where id=? ";
+////
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+////
+////        return jdbcTemplate.update(sql, new Object[]{status, id});
+////    }
 //
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 //
-//        return jdbcTemplate.update(sql, new Object[]{status, id});
-//    }
-
-
-//    public Integer countPagingCustom(String whereCase, Object[] paramValues) {
-//        String sql = "select count(1)  from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " + whereCase;
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
-//    }
-
-//    @Override
-//    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
-//
-//
-//
-//        String oriSql = "SELECT t1.status, t1.job_code , t1.id, t1.name,  t1.email, t1.mobile, t1.dept_id, sd.name as dept_name, t1.usertype, t1.del_flag, t2.identity, t1.sex, t2.documentno, t2.regulartm, t2.hrcode, t2.saleno  " +
-//                "FROM  sys_user t1 LEFT JOIN esm_user_internal t2 ON t1.id=t2.id " +
-//                "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " + whereCase;
-//
-//        Dialect dialect = Dialect.guessDialect(dataSource);
-//        String sql = dialect.pagin(pageNumber, pageSize, oriSql);
-//
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-////		NamedParameterJdbcTemplate jdbc = new NamedParameterJdbcTemplate(jdbcTemplate);
-//
-//        List<SysUseresmUserInternalVO> recordList = new ArrayList<SysUseresmUserInternalVO>();
-//
-//        jdbcTemplate.query(sql, paramValues,
-//                new RowCallbackHandler() {
-//                    @Override
-//                    public void processRow(ResultSet resultSet) throws SQLException {
-//                        SysUseresmUserInternalVO model = new SysUseresmUserInternalVO();
-//                        model.setStatus(resultSet.getString("status"));
-//                        model.setJobCode(resultSet.getString("job_code"));
-//                        model.setId(resultSet.getString("id"));
-//                        model.setName(resultSet.getString("name"));
-//                        model.setEmail(resultSet.getString("email"));
-//                        model.setMobile(resultSet.getString("mobile"));
-//                        model.setDeptId(resultSet.getString("dept_id"));
-//                        model.setDeptName(resultSet.getString("dept_name"));
-//                        model.setUsertype(resultSet.getString("usertype"));
-//                        model.setDelFlag(resultSet.getInt("del_flag"));
-//                        model.setIdentity(resultSet.getString("identity"));
-//                        model.setSex(resultSet.getString("sex"));
-//                        model.setDocumentno(resultSet.getString("documentno"));
-//                        model.setRegulartm(resultSet.getDate("regulartm"));
-//                        model.setHrcode(resultSet.getString("hrcode"));
-//                        model.setSaleno(resultSet.getString("saleno"));
-//
-//                        recordList.add(model);
-//                    }
-//                });
-//
-//        int totalCount = countPagingCustom(whereCase, paramValues);
-//
-//        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
-//
-//        return PageResult;
-//    }
-
-//    @Override
-//    public String findMaxId(String deptId) {
-//        QueryWrapper<EsmUserInternal> qw = new QueryWrapper<>();
-//        qw.select("IFNULL(MAX(id),0) maxId");
-//        Map<String,Object> m = getMap(qw);
-//        String maxId = m.get("maxId").toString();
-//        return maxId;
+////    public Integer countPagingCustom(String whereCase, Object[] paramValues) {
+////        String sql = "select count(1)  from sys_user t1 left join esm_user_internal t2 on t1.id=t2.id " + whereCase;
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+////        return jdbcTemplate.queryForObject(sql, paramValues, Integer.class);
+////    }
+//
+////    @Override
+////    public PageResult selectPagingCustom(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
+////
+////
+////
+////        String oriSql = "SELECT t1.status, t1.job_code , t1.id, t1.name,  t1.email, t1.mobile, t1.dept_id, sd.name as dept_name, t1.usertype, t1.del_flag, t2.identity, t1.sex, t2.documentno, t2.regulartm, t2.hrcode, t2.saleno  " +
+////                "FROM  sys_user t1 LEFT JOIN esm_user_internal t2 ON t1.id=t2.id " +
+////                "LEFT JOIN sys_dept sd ON t1.dept_id=sd.id " + whereCase;
+////
+////        Dialect dialect = Dialect.guessDialect(dataSource);
+////        String sql = dialect.pagin(pageNumber, pageSize, oriSql);
+////
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//////		NamedParameterJdbcTemplate jdbc = new NamedParameterJdbcTemplate(jdbcTemplate);
+////
+////        List<SysUseresmUserInternalVO> recordList = new ArrayList<SysUseresmUserInternalVO>();
+////
+////        jdbcTemplate.query(sql, paramValues,
+////                new RowCallbackHandler() {
+////                    @Override
+////                    public void processRow(ResultSet resultSet) throws SQLException {
+////                        SysUseresmUserInternalVO model = new SysUseresmUserInternalVO();
+////                        model.setStatus(resultSet.getString("status"));
+////                        model.setJobCode(resultSet.getString("job_code"));
+////                        model.setId(resultSet.getString("id"));
+////                        model.setName(resultSet.getString("name"));
+////                        model.setEmail(resultSet.getString("email"));
+////                        model.setMobile(resultSet.getString("mobile"));
+////                        model.setDeptId(resultSet.getString("dept_id"));
+////                        model.setDeptName(resultSet.getString("dept_name"));
+////                        model.setUsertype(resultSet.getString("usertype"));
+////                        model.setDelFlag(resultSet.getInt("del_flag"));
+////                        model.setIdentity(resultSet.getString("identity"));
+////                        model.setSex(resultSet.getString("sex"));
+////                        model.setDocumentno(resultSet.getString("documentno"));
+////                        model.setRegulartm(resultSet.getDate("regulartm"));
+////                        model.setHrcode(resultSet.getString("hrcode"));
+////                        model.setSaleno(resultSet.getString("saleno"));
+////
+////                        recordList.add(model);
+////                    }
+////                });
+////
+////        int totalCount = countPagingCustom(whereCase, paramValues);
+////
+////        PageResult PageResult = new PageResult(pageNumber, pageSize, totalCount, recordList);
+////
+////        return PageResult;
+////    }
+//
+////    @Override
+////    public String findMaxId(String deptId) {
+////        QueryWrapper<EsmUserInternal> qw = new QueryWrapper<>();
+////        qw.select("IFNULL(MAX(id),0) maxId");
+////        Map<String,Object> m = getMap(qw);
+////        String maxId = m.get("maxId").toString();
+////        return maxId;
+////
+////    }
+////    @Override
+////    public String findMaxId(String deptId) {
+////        String sql = "SELECT MAX(id) FROM sys_user t  WHERE dept_id=?"; // AND usertype=?";
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+////        return jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
+////    }
+//
+////    // 统计临时人员
+////    @Override
+////    public int queryTempNum(String deptId) {
+////        LambdaQueryWrapper<EsmUserInternal> lqw = new LambdaQueryWrapper<>();
+////        return (int)count(lqw);
+////        String sql = "select count(*) from sys_user a,esm_user_internal_check b where a.id=b.id and a.dept_id=? and b.status != '1'";
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+////        String num = jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
+////        return Integer.valueOf(num);
+////    }
+////    // 统计临时人员
+////    @Override
+////    public int queryTempNum(String deptId) {
+////        String sql = "select count(*) from sys_user a,esm_user_internal_check b where a.id=b.id and a.dept_id=? and b.status != '1'";
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+////        String num = jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
+////        return Integer.valueOf(num);
+////    }
+//
+////    @Override
+////    public List<String> queryTeamUser(String id) {
+////
+////
+////        List<String> recordList = new ArrayList<String>();
+////        String sql = "select id from esm_user_agent_check a where a.recommenderid=? and not exists (select 1 from esm_user_agent t where t.id=a.id)";
+////        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+////        jdbcTemplate.query(sql, new Object[]{id},
+////                new RowCallbackHandler() {
+////                    @Override
+////                    public void processRow(ResultSet resultSet) throws SQLException {
+////                        recordList.add(resultSet.getString("id"));
+////                    }
+////                });
+////        return recordList;
+////    }
+//
+//
+//    public class SysUseresmUserInternalVO implements Serializable {
+//        private static final long serialVersionUID = 5445785034406404908L;
+//
+//        private String status;
+//
+//        public String getStatus() {
+//            return status;
+//        }
+//
+//        public void setStatus(String status) {
+//            this.status = status;
+//        }
+//
+//        private String jobCode;
+//
+//        public String getJobCode() {
+//            return jobCode;
+//        }
+//
+//        public void setJobCode(String jobCode) {
+//            this.jobCode = jobCode;
+//        }
+//
+//        private String deptName;
+//
+//        public String getDeptName() {
+//            return deptName;
+//        }
+//
+//        public void setDeptName(String deptName) {
+//            this.deptName = deptName;
+//        }
+//
+//        //编号
+//        private String id;
+//        //用户名
+//        private String name;
+//        //邮箱
+//        private String email;
+//        //手机号
+//        private String mobile;
+//        //机构ID
+//        private String deptId;
+//        //用户类型：0:系统用户 1：后线人员 2：代理人员
+//        private String usertype;
+//        //是否删除  -1：已删除  0：正常
+//        private Integer delFlag;
+//        //身份证号
+//        private String identity;
+//        //性别
+//        private String sex;
+//        //后线人员档案号
+//        private String documentno;
+//        //转正时间
+//        private Date regulartm;
+//        //后线人员HR编码
+//        private String hrcode;
+//        //业务员职业证书号：
+//        private String saleno;
+//
+//        public String getId() {
+//            return id;
+//        }
+//
+//        public void setId(String id) {
+//            this.id = id;
+//        }
+//
+//        public String getName() {
+//            return name;
+//        }
+//
+//        public void setName(String name) {
+//            this.name = name;
+//        }
+//
+//
+//        public String getEmail() {
+//            return email;
+//        }
+//
+//        public void setEmail(String email) {
+//            this.email = email;
+//        }
+//
+//        public String getMobile() {
+//            return mobile;
+//        }
+//
+//        public void setMobile(String mobile) {
+//            this.mobile = mobile;
+//        }
+//
+//        public String getDeptId() {
+//            return deptId;
+//        }
+//
+//        public void setDeptId(String deptId) {
+//            this.deptId = deptId;
+//        }
+//
+//        public String getUsertype() {
+//            return usertype;
+//        }
+//
+//        public void setUsertype(String usertype) {
+//            this.usertype = usertype;
+//        }
+//
+//        public Integer getDelFlag() {
+//            return delFlag;
+//        }
+//
+//        public void setDelFlag(Integer delFlag) {
+//            this.delFlag = delFlag;
+//        }
+//
+//        public String getIdentity() {
+//            return identity;
+//        }
+//
+//        public void setIdentity(String identity) {
+//            this.identity = identity;
+//        }
+//
+//        public String getSex() {
+//            return sex;
+//        }
+//
+//        public void setSex(String sex) {
+//            this.sex = sex;
+//        }
+//
+//        public String getDocumentno() {
+//            return documentno;
+//        }
+//
+//        public void setDocumentno(String documentno) {
+//            this.documentno = documentno;
+//        }
+//
+//        public Date getRegulartm() {
+//            return regulartm;
+//        }
+//
+//        public void setRegulartm(Date regulartm) {
+//            this.regulartm = regulartm;
+//        }
+//
+//        public String getHrcode() {
+//            return hrcode;
+//        }
+//
+//        public void setHrcode(String hrcode) {
+//            this.hrcode = hrcode;
+//        }
+//
+//        public String getSaleno() {
+//            return saleno;
+//        }
+//
+//        public void setSaleno(String saleno) {
+//            this.saleno = saleno;
+//        }
+//
 //
 //    }
-//    @Override
-//    public String findMaxId(String deptId) {
-//        String sql = "SELECT MAX(id) FROM sys_user t  WHERE dept_id=?"; // AND usertype=?";
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        return jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
-//    }
-
-//    // 统计临时人员
-//    @Override
-//    public int queryTempNum(String deptId) {
-//        LambdaQueryWrapper<EsmUserInternal> lqw = new LambdaQueryWrapper<>();
-//        return (int)count(lqw);
-//        String sql = "select count(*) from sys_user a,esm_user_internal_check b where a.id=b.id and a.dept_id=? and b.status != '1'";
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        String num = jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
-//        return Integer.valueOf(num);
-//    }
-//    // 统计临时人员
-//    @Override
-//    public int queryTempNum(String deptId) {
-//        String sql = "select count(*) from sys_user a,esm_user_internal_check b where a.id=b.id and a.dept_id=? and b.status != '1'";
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        String num = jdbcTemplate.queryForObject(sql, String.class, new Object[]{deptId});
-//        return Integer.valueOf(num);
-//    }
-
-//    @Override
-//    public List<String> queryTeamUser(String id) {
-//
-//
-//        List<String> recordList = new ArrayList<String>();
-//        String sql = "select id from esm_user_agent_check a where a.recommenderid=? and not exists (select 1 from esm_user_agent t where t.id=a.id)";
-//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-//        jdbcTemplate.query(sql, new Object[]{id},
-//                new RowCallbackHandler() {
-//                    @Override
-//                    public void processRow(ResultSet resultSet) throws SQLException {
-//                        recordList.add(resultSet.getString("id"));
-//                    }
-//                });
-//        return recordList;
-//    }
-
-
-    public class SysUseresmUserInternalVO implements Serializable {
-        private static final long serialVersionUID = 5445785034406404908L;
-
-        private String status;
-
-        public String getStatus() {
-            return status;
-        }
-
-        public void setStatus(String status) {
-            this.status = status;
-        }
-
-        private String jobCode;
-
-        public String getJobCode() {
-            return jobCode;
-        }
-
-        public void setJobCode(String jobCode) {
-            this.jobCode = jobCode;
-        }
-
-        private String deptName;
-
-        public String getDeptName() {
-            return deptName;
-        }
-
-        public void setDeptName(String deptName) {
-            this.deptName = deptName;
-        }
-
-        //编号
-        private String id;
-        //用户名
-        private String name;
-        //邮箱
-        private String email;
-        //手机号
-        private String mobile;
-        //机构ID
-        private String deptId;
-        //用户类型：0:系统用户 1：后线人员 2：代理人员
-        private String usertype;
-        //是否删除  -1：已删除  0：正常
-        private Integer delFlag;
-        //身份证号
-        private String identity;
-        //性别
-        private String sex;
-        //后线人员档案号
-        private String documentno;
-        //转正时间
-        private Date regulartm;
-        //后线人员HR编码
-        private String hrcode;
-        //业务员职业证书号：
-        private String saleno;
-
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-
-        public String getEmail() {
-            return email;
-        }
-
-        public void setEmail(String email) {
-            this.email = email;
-        }
-
-        public String getMobile() {
-            return mobile;
-        }
-
-        public void setMobile(String mobile) {
-            this.mobile = mobile;
-        }
-
-        public String getDeptId() {
-            return deptId;
-        }
-
-        public void setDeptId(String deptId) {
-            this.deptId = deptId;
-        }
-
-        public String getUsertype() {
-            return usertype;
-        }
-
-        public void setUsertype(String usertype) {
-            this.usertype = usertype;
-        }
-
-        public Integer getDelFlag() {
-            return delFlag;
-        }
-
-        public void setDelFlag(Integer delFlag) {
-            this.delFlag = delFlag;
-        }
-
-        public String getIdentity() {
-            return identity;
-        }
-
-        public void setIdentity(String identity) {
-            this.identity = identity;
-        }
-
-        public String getSex() {
-            return sex;
-        }
-
-        public void setSex(String sex) {
-            this.sex = sex;
-        }
-
-        public String getDocumentno() {
-            return documentno;
-        }
-
-        public void setDocumentno(String documentno) {
-            this.documentno = documentno;
-        }
-
-        public Date getRegulartm() {
-            return regulartm;
-        }
-
-        public void setRegulartm(Date regulartm) {
-            this.regulartm = regulartm;
-        }
-
-        public String getHrcode() {
-            return hrcode;
-        }
-
-        public void setHrcode(String hrcode) {
-            this.hrcode = hrcode;
-        }
-
-        public String getSaleno() {
-            return saleno;
-        }
-
-        public void setSaleno(String saleno) {
-            this.saleno = saleno;
-        }
-
-
-    }
-
-    public List<SysUser> getSuperior(String id) {
-        List<SysUser> userList = new ArrayList<SysUser>();
-        for (int i = 0; i < 3; i++) {
-//            StringBuffer whereStr = new StringBuffer(" where 1=1 ");
-//            ArrayList<String> params = new ArrayList<String>();
+//
+//    public List<SysUser> getSuperior(String id) {
+//        List<SysUser> userList = new ArrayList<SysUser>();
+//        for (int i = 0; i < 3; i++) {
+////            StringBuffer whereStr = new StringBuffer(" where 1=1 ");
+////            ArrayList<String> params = new ArrayList<String>();
+////            if (id != null) {
+////                whereStr.append(" and id = ?");
+////                params.add(id);
+////            }
+////
+////            List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
+//
+//
+//            TeamUserQryVO vo = new TeamUserQryVO();
 //            if (id != null) {
-//                whereStr.append(" and id = ?");
-//                params.add(id);
+//                vo.setId(id);
+//            }
+//            List<TeamUserVONew> list = esmUserAgentService.gainBelowUserByUserId(vo);
+//
+//            if (list != null && list.size() > 0) {
+//                id = list.get(0).getRecommenderId(); //上级推荐人代码
+//                if (StringUtils.isNullOrEmpty(id)) {
+//                    break;
+//                }
+//                SysUser user = sysUserService.getById(id);
+//                userList.add(user);
 //            }
+//        }
+//
+//        return userList;
+//    }
+//
+//}
+//
+//
 //
-//            List<EsmUserAgent> list = esmUserAgentService.selectList(whereStr.toString(), params.toArray());
-
-
-            TeamUserQryVO vo = new TeamUserQryVO();
-            if (id != null) {
-                vo.setId(id);
-            }
-            List<TeamUserVONew> list = esmUserAgentService.gainBelowUserByUserId(vo);
-
-            if (list != null && list.size() > 0) {
-                id = list.get(0).getRecommenderId(); //上级推荐人代码
-                if (StringUtils.isNullOrEmpty(id)) {
-                    break;
-                }
-                SysUser user = sysUserService.getById(id);
-                userList.add(user);
-            }
-        }
-
-        return userList;
-    }
-
-}
-
-
-

src/main/java/com/ydtech/modules/esm/service/impl/EsmUserReferrerServiceImpl.java

@@ -3,8 +3,13 @@ package com.ydtech.modules.esm.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.vo.SysReferrerVo;
+import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.model.dto.PageDto;
+import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.esm.dao.EsmUserReferrerMapper;
 import com.ydtech.modules.esm.model.EsmUserReferrer;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
@@ -32,40 +37,108 @@ public class EsmUserReferrerServiceImpl extends ServiceImpl<EsmUserReferrerMappe
         Map m = new HashMap();
 
         LambdaQueryWrapper<EsmUserReferrer> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(EsmUserReferrer::getReferrerId,agent.getId());
+        lqw.eq(EsmUserReferrer::getReferrerId, agent.getId());
         List<EsmUserReferrer> listAll = esmUserReferrerService.list(lqw);
 
         List<SysUser> oneList = new ArrayList<>();
         List<SysUser> oneTempList = new ArrayList<>();
-        listAll.stream().forEach(a ->{
+        listAll.stream().forEach(a -> {
             SysUser sysUser = sysUserService.getById(a.getId());
-            if(sysUser.getStatus() == 1){
+            if (sysUser.getStatus() == 1) {
                 oneList.add(sysUser);
-            }else{
+            } else {
                 oneTempList.add(sysUser);
             }
 
         });
-        m.put("list1",oneList);
-        m.put("list2",oneTempList);
+        m.put("list1", oneList);
+        m.put("list2", oneTempList);
         return m;
     }
 
     @Override
-    public void buildLevelList(SysUser user,List<SysUser> oneList, List<SysUser> oneTempList) {
-            Map<String,List<SysUser>> oneMap = buildLevelInfo(user);
-            oneList.addAll(oneMap.get("list1"));
-            oneTempList.addAll(oneMap.get("list2"));
+    public void buildLevelList(SysUser user, List<SysUser> oneList, List<SysUser> oneTempList) {
+        Map<String, List<SysUser>> oneMap = buildLevelInfo(user);
+        oneList.addAll(oneMap.get("list1"));
+        oneTempList.addAll(oneMap.get("list2"));
 
     }
 
+    @Override
+    public void addReferrer(String referrerId, String nextPK) {
+        if(referrerId.equals(nextPK)) throw new SystemException("推荐人不能是自己");
+        //推荐人信息
+        EsmUserReferrer referrer = getById(referrerId);
+        EsmUserReferrer eur = new EsmUserReferrer();
+
+        if (null == referrer) {
+            eur.setId(referrerId);
+            eur.setLevel(0);
+            eur.setAffiliation(referrerId);
+            SysUser user = sysUserService.getById(referrerId);
+            eur.setReferrerId(referrerId);
+            eur.setReferrerName(user.getName());
+            esmUserReferrerService.save(eur);
+            referrer = getById(referrerId);
+        }
+
+
+//        //上级推荐人信息
+//        EsmUserReferrer referrerSuperior = esmUserReferrerService.getById(referrer.getReferrerId());
+//        if (null != referrerSuperior) {
+//            referrer.setAffiliation(referrerSuperior.getAffiliation());
+//        }
+        eur.setId(nextPK);
+        eur.setReferrerName(referrer.getReferrerName());
+        eur.setReferrerId(referrer.getReferrerId());
+        eur.setLevel(referrer.getLevel() + 1);
+        eur.setAffiliation(referrer.getAffiliation());
+//        if (null != referrer) {
+//            eur.setLevel(referrer.getLevel() + 1);
+//        } else {
+//            eur.setLevel(1);
+//        }
+        esmUserReferrerService.saveOrUpdate(eur);
+    }
+
 
     @Override
     public boolean deldeleteByReferrerId(String userId) {
         LambdaQueryWrapper<EsmUserReferrer> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(EsmUserReferrer::getId,userId);
+        queryWrapper.eq(EsmUserReferrer::getId, userId);
         return remove(queryWrapper);
     }
+
+    @Override
+    public PageVo gainReferrerPage(PageDto pageDto) {
+
+        PageVo<SysReferrerVo> pageVo = new PageVo();
+
+        //获取分页数量
+        int total = super.baseMapper.countReferrerByAffiliation(pageDto);
+
+        //计算mysql分页起索引
+        int firstIndex = pageDto.getPageNum() == 1 ? 0 : (pageDto.getPageNum() - 1) * pageDto.getPageSize();
+
+
+        //计算mysql分页总页数
+        int totalPages = total % pageDto.getPageSize() == 0 ? total / pageDto.getPageSize() : total / pageDto.getPageSize() + 1;
+
+
+        //响应
+        pageVo.setTotalSize(total);
+        pageVo.setPageNum(pageDto.getPageNum());
+        pageVo.setPageSize(pageDto.getPageSize());
+        pageVo.setTotalPages(totalPages);
+
+
+        //请求替换分页开始索引
+        pageDto.setPageNum(firstIndex);
+        pageVo.setContent(super.baseMapper.selectReferrerByAffiliation(pageDto));
+
+
+        return pageVo;
+    }
 }
 
 

src/main/java/com/ydtech/modules/ins/controller/InsALY_CBITAPIController.java

@@ -17,7 +17,6 @@ import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.model.InsTaskHistory;
 import com.ydtech.modules.ins.model.cbit.*;
@@ -74,8 +73,6 @@ public class InsALY_CBITAPIController extends BaseController {
     SysDeptService sysDeptService;
     @Autowired
     EsmRetailService esmRetailService;
-    @Autowired
-    EsmUserInternalService esmUserInternalService;
 
     //接口域名
     @Value("${aly.cbit.url_pre}")
@@ -122,81 +119,81 @@ public class InsALY_CBITAPIController extends BaseController {
         return httpResult;
     }
 
-    /**
-     * 报价（需调用多个个接口：订单号生成、车辆确认、报价）
-     *
-     * @param quoteInfo
-     * @return
-     */
-    @PostMapping("/quote")
-    public HttpResult quote(@RequestBody CBITQuoteInfoVo quoteInfo) {
-        HttpResult httpResult = null;
-        String req_desc = "报价接口";
-        String url = url_pre + "/quote";
-        try {
-
-            //2.调用保信接口
-            String req_json = JSON.toJSONString(quoteInfo);
-            logger.info(req_desc + "--请求url-->" + url);
-            logger.info(req_desc + "--请求参数-->" + req_json);
-            String resp_json = HttpsPostUtil.sendCBITPost_self(url, req_json);
-            logger.info(req_desc + "--返回结果-->" + resp_json);
-            //4.处理保信接口返回数据
-            ObjectMapper objectMapper = new ObjectMapper();
-            ObjectReader reader = objectMapper.readerFor(HttpResult.class);
-            try {
-                httpResult = reader.readValue(resp_json);
-            } catch (IOException e) {
-                httpResult = null;
-                logger.error("反序列化失败", e);
-            }
-            if (httpResult == null) {
-                throw new Exception("反序列化失败");
-            }
-            if (httpResult.getCode() != 200) {
-                return HttpResult.error(req_desc + "返回错误，错误信息：" + httpResult.getMsg());
-            } else {
-                //插入ins_order表
-                List<QuoteRespData> quoteResults = JSON.parseArray(JSON.toJSONString(httpResult.getData()), QuoteRespData.class);
-                for (QuoteRespData quoteRespData : quoteResults) {
-                    InsOrder insOrder = geneInsOrder(quoteRespData.getQuoteInfo(), quoteRespData, quoteInfo.getInsurers(), quoteRespData.getQuoteInfo().getVehicleModel_QueRen());
-                    quoteRespData.setInsOrder(insOrder);
-//                    InsOrder insOrder=quoteRespData.getInsOrder();
-                    insOrderService.insert(insOrder);
-                    //插入轨迹表
-                    InsTaskHistory history = new InsTaskHistory();
-                    history.setId(String.valueOf(new Date().getTime()));
-                    history.setCompany(insOrder.getInscompany());
-                    history.setTaskid(insOrder.getOrderno());
-                    history.setOperatorid(insOrder.getUserid());
-                    history.setOperator(insOrder.getUsername());
-                    SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    history.setCreatetime(sdfm.format(new Date()));
-                    history.setOperator(insOrder.getUsername());
-                    history.setStatus("0");
-                    history.setRemark("报价中");
-                    insTaskHistoryService.insert(history);
-
-                    history.setId(String.valueOf(new Date().getTime()));
-                    history.setCompany(insOrder.getInscompany());
-                    history.setTaskid(insOrder.getOrderno());
-                    history.setOperatorid(insOrder.getUserid());
-                    history.setOperator(insOrder.getUsername());
-                    history.setCreatetime(sdfm.format(new Date()));
-                    history.setOperator(insOrder.getUsername());
-                    history.setStatus("1");
-                    history.setRemark("待核保");
-                    insTaskHistoryService.insert(history);
-                }
-                httpResult.setData(quoteResults);
-
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return HttpResult.error(e.getMessage());
-        }
-        return httpResult;
-    }
+//    /**
+//     * 报价（需调用多个个接口：订单号生成、车辆确认、报价）
+//     *
+//     * @param quoteInfo
+//     * @return
+//     */
+//    @PostMapping("/quote")
+//    public HttpResult quote(@RequestBody CBITQuoteInfoVo quoteInfo) {
+//        HttpResult httpResult = null;
+//        String req_desc = "报价接口";
+//        String url = url_pre + "/quote";
+//        try {
+//
+//            //2.调用保信接口
+//            String req_json = JSON.toJSONString(quoteInfo);
+//            logger.info(req_desc + "--请求url-->" + url);
+//            logger.info(req_desc + "--请求参数-->" + req_json);
+//            String resp_json = HttpsPostUtil.sendCBITPost_self(url, req_json);
+//            logger.info(req_desc + "--返回结果-->" + resp_json);
+//            //4.处理保信接口返回数据
+//            ObjectMapper objectMapper = new ObjectMapper();
+//            ObjectReader reader = objectMapper.readerFor(HttpResult.class);
+//            try {
+//                httpResult = reader.readValue(resp_json);
+//            } catch (IOException e) {
+//                httpResult = null;
+//                logger.error("反序列化失败", e);
+//            }
+//            if (httpResult == null) {
+//                throw new Exception("反序列化失败");
+//            }
+//            if (httpResult.getCode() != 200) {
+//                return HttpResult.error(req_desc + "返回错误，错误信息：" + httpResult.getMsg());
+//            } else {
+//                //插入ins_order表
+//                List<QuoteRespData> quoteResults = JSON.parseArray(JSON.toJSONString(httpResult.getData()), QuoteRespData.class);
+//                for (QuoteRespData quoteRespData : quoteResults) {
+//                    InsOrder insOrder = geneInsOrder(quoteRespData.getQuoteInfo(), quoteRespData, quoteInfo.getInsurers(), quoteRespData.getQuoteInfo().getVehicleModel_QueRen());
+//                    quoteRespData.setInsOrder(insOrder);
+////                    InsOrder insOrder=quoteRespData.getInsOrder();
+//                    insOrderService.insert(insOrder);
+//                    //插入轨迹表
+//                    InsTaskHistory history = new InsTaskHistory();
+//                    history.setId(String.valueOf(new Date().getTime()));
+//                    history.setCompany(insOrder.getInscompany());
+//                    history.setTaskid(insOrder.getOrderno());
+//                    history.setOperatorid(insOrder.getUserid());
+//                    history.setOperator(insOrder.getUsername());
+//                    SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                    history.setCreatetime(sdfm.format(new Date()));
+//                    history.setOperator(insOrder.getUsername());
+//                    history.setStatus("0");
+//                    history.setRemark("报价中");
+//                    insTaskHistoryService.insert(history);
+//
+//                    history.setId(String.valueOf(new Date().getTime()));
+//                    history.setCompany(insOrder.getInscompany());
+//                    history.setTaskid(insOrder.getOrderno());
+//                    history.setOperatorid(insOrder.getUserid());
+//                    history.setOperator(insOrder.getUsername());
+//                    history.setCreatetime(sdfm.format(new Date()));
+//                    history.setOperator(insOrder.getUsername());
+//                    history.setStatus("1");
+//                    history.setRemark("待核保");
+//                    insTaskHistoryService.insert(history);
+//                }
+//                httpResult.setData(quoteResults);
+//
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//            return HttpResult.error(e.getMessage());
+//        }
+//        return httpResult;
+//    }
 
     /**
      * 3.8核保接口
@@ -654,226 +651,226 @@ public class InsALY_CBITAPIController extends BaseController {
         sysCbitErrorService.insert(sysCbitError);
     }
 
-    //报价生成ins_order
-    private InsOrder geneInsOrder(CBITQuoteInfoVo quoteInfo, QuoteRespData quoteRespData, String insures, VehicleModel_QueRen vehicleModel_QueRen) throws Exception {
-        InsOrder insOrder = new InsOrder();
-        String orderno = quoteRespData.getOrderno();
-        insOrder.setOrderno(orderno);
-        insOrder.setQuoteno(String.valueOf(quoteInfo.getQuoteno()));
-        insOrder.setOrderstatus("0");  //0报价 1待核保 2已核保待缴费 3核保退回 4核保不通过
-        insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
-        insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
-
-        insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(vehicleModel_QueRen)));
-        SysUser user = sysUserService.getById(quoteInfo.getUserId());
-        if (user == null) {
-            throw new Exception("userId不存在");
-        }
-        //
-        if (StringUtils.isEmpty(quoteInfo.getCarInfo().getFrameNo())) {
-            throw new Exception("车架号不能为空");
-        }
-        InsOrder orderObj = insOrderService.queryQuoteno(new Object[]{quoteInfo.getUserId(), quoteInfo.getCarInfo().getFrameNo(), quoteInfo.getQuoteno()});
-        if (orderObj != null) {
-            List<InsOrder> listo = insOrderService.selectList(" where quoteno=?", new Object[]{orderObj.getQuoteno()});
-            String status = "0";
-            for (InsOrder order : listo) {
-                if (!"0".equals(order.getOrderstatus())) {
-                    status = order.getOrderstatus();
-                }
-            }
-            //0报价中 1待核保 2已核保 3核保退回 4核保不通过 5已核保待缴费 6已缴费 7已承保 99已关闭
-            if ("0".equals(status)) {//关闭订单
-                insOrderService.closeOrder(orderObj.getOrderno(), "99");
-            } else if (!"99".equals(status)) {
-                throw new Exception("此车辆已提交核保，重新报价请先关闭订单，任务号:" + orderObj.getQuoteno());
-            }
-        }
-
-
-        insOrder.setUsername(user.getName());
-        insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.getById(user.getDeptId());
-        insOrder.setDeptname(dept == null ? "" : dept.getName());
-
-
-        insOrder.setOwnerinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getOwnerInfo())));
-        insOrder.setApplyinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getPolicyHolderInfo())));
-        insOrder.setInsureinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getInsuredPersonInfo())));
-
-        insOrder.setInsuredname(quoteInfo.getPolicyHolderInfo().getName());
-        List<CBITRiskInfoVo> risks = quoteInfo.getRiskList();
-        for (CBITRiskInfoVo risk : risks) {
-            if ("0507".equals(risk.getRiskCode())) {//交强
-                insOrder.setJqstartdate(risk.getStartDate());
-                insOrder.setJqenddate(risk.getEndDate());
-            }
-            if ("0510".equals(risk.getRiskCode())) {//商业
-                insOrder.setSystartdate(risk.getStartDate());
-                insOrder.setSyenddate(risk.getEndDate());
-            }
-        }
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
-        String productId = "";
-        String productname = "";
-        //平安：000004
-        //太平：000005
-        //太平洋：000007
-        String ins_zgdd = "";
-        String inscompany = "";
-        if (insures.contains("000017")) {
-            ins_zgdd = "000004";
-            inscompany = "平安-000017";
-        } else if (insures.contains("000026")) {
-            ins_zgdd = "000005";
-            inscompany = "太平-000026";
-        } else if (insures.contains("000014")) {
-            ins_zgdd = "000007";
-            inscompany = "太平洋-000014";
-        }
-
-
-        List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
-                "and exists (select 1 from esm_agreement_prod t2 where t.id=t2.agreeid and t2.authcomcode like ?)", new Object[]{ins_zgdd + "%", "%" + user.getDeptId() + "%"});
-        if (agreements.size() == 0) {
-            throw new Exception("不存在有效协议或机构" + user.getDeptId() + "未授权");
-        }
-        String agreeid = agreements.get(0).getId();
-        insOrder.setAgreeid(agreeid);
-        //匹配协议，获取费用
-        StringBuffer whereStr = new StringBuffer();
-        List params = new ArrayList();// where t.agreeid=? and t.productid in ()
-        whereStr.append("where t.agreeid=? ");
-        params.add(agreeid);
-        if (risks.size() == 1 && "0507".equals(risks.get(0).getRiskCode())) {
-            productId = "ZG01001";
-            productname = "单交强";
-            whereStr.append(" and t.productid=?");
-            params.add(productId);
-        } else if (risks.size() == 1 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
-            productId = "ZG01002";
-            productname = "单三者";
-            whereStr.append(" and t.productid=?");
-            params.add(productId);
-        } else if (risks.size() == 1) {
-            productId = "ZG01003";
-            productname = "单商业";
-            whereStr.append(" and t.productid=?");
-            params.add(productId);
-        } else if (risks.size() == 2 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
-            productId = "ZG01004";
-            productname = "交强+三者";
-            whereStr.append(" and t.productid in (?,?)");
-            params.add("ZG01004");
-            params.add("ZG01005");
-        } else {
-            productId = "ZG01006";
-            productname = "交强+商业";
-            whereStr.append(" and t.productid in (?,?)");
-            params.add("ZG01006");
-            params.add("ZG01007");
-        }
-
-        double retailRate = countRetail(user.getDeptId(), user.getId());
-        insOrder.setProductid(productId);
-        insOrder.setProduct(productname);
-        List<EsmAgreementProd> agreementProds = esmAgreementProdService.selectList(whereStr.toString(), params.toArray());
-        for (EsmAgreementProd prod : agreementProds) {
-            if ("ZG01001".equals(prod.getProductid()) || "ZG01004".equals(prod.getProductid()) || "ZG01006".equals(prod.getProductid())) {
-
-                insOrder.setFeerate(prod.getProductrate());//交强手续费比例
-                insOrder.setJqdiscountrate(prod.getFeerate() - retailRate < 0 ? 0 : prod.getFeerate() - retailRate); //交强优惠比例=业务员绩效-分销费用
-            } else {
-
-                insOrder.setDisrate(prod.getProductrate()); //商业手续费比例
-                insOrder.setSydiscountrate(prod.getFeerate() - retailRate < 0 ? 0 : prod.getFeerate() - retailRate); //商业优惠比例=业务员绩效-分销费用
-            }
-            insOrder.setProductid(prod.getId());
-        }
-
-        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getRiskList())));
-        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getKindList())));
-
-        insOrder.setInscompany(inscompany);
-        SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        insOrder.setCreatetime(sdfm.format(new Date()));
-
-        TrafficPolicy_resp trafficPolicy = quoteRespData.getTrafficPolicy();
-        BusinessPolicy_resp businessPolicy = quoteRespData.getBusinessPolicy();
-        BigDecimal vehicleTax = new BigDecimal(0);
-        if (trafficPolicy != null) {//交强保费
-            BigDecimal Vehiclemium = trafficPolicy.getPremium();
-            vehicleTax = trafficPolicy.getVehicleTax().getTotalAmount();
-            Vehiclemium = Vehiclemium.setScale(2, BigDecimal.ROUND_HALF_UP);
-            insOrder.setJqpremium(Vehiclemium.doubleValue());
-            insOrder.setTaxamount(vehicleTax.doubleValue());
-        }
-        if (businessPolicy != null) {//商业保费
-            BigDecimal bd = businessPolicy.getPremium();
-            bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
-            double syPremium = bd.doubleValue();
-            insOrder.setSypremium(syPremium);
-        }
-
-        BigDecimal bd = quoteRespData.getPremium();
-        bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
-        insOrder.setSumpremium(bd.doubleValue());
-        //报价状态 0失败 1成功
-
-        BigDecimal bds = new BigDecimal(insOrder.getSypremium());
-        BigDecimal bd1 = bds.setScale(2, BigDecimal.ROUND_HALF_UP);
-
-        insOrder.setSypremium(bd1.doubleValue());
-        insOrder.setQuotestatus("1");
-
-        insOrder.setUserid(user.getId());
-        logger.info("用户id====" + insOrder.getUserid());
-
-        return insOrder;
-    }
-
-    ;
-
-    /**
-     * 分销费用统计
-     *
-     * @param deptid
-     * @param userid
-     * @return
-     */
-    public double countRetail(String deptid, String userid) {
-        double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
-        return retailRate;
-    }
+//    //报价生成ins_order
+//    private InsOrder geneInsOrder(CBITQuoteInfoVo quoteInfo, QuoteRespData quoteRespData, String insures, VehicleModel_QueRen vehicleModel_QueRen) throws Exception {
+//        InsOrder insOrder = new InsOrder();
+//        String orderno = quoteRespData.getOrderno();
+//        insOrder.setOrderno(orderno);
+//        insOrder.setQuoteno(String.valueOf(quoteInfo.getQuoteno()));
+//        insOrder.setOrderstatus("0");  //0报价 1待核保 2已核保待缴费 3核保退回 4核保不通过
+//        insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
+//        insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
+//
+//        insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(vehicleModel_QueRen)));
+//        SysUser user = sysUserService.getById(quoteInfo.getUserId());
+//        if (user == null) {
+//            throw new Exception("userId不存在");
+//        }
+//        //
+//        if (StringUtils.isEmpty(quoteInfo.getCarInfo().getFrameNo())) {
+//            throw new Exception("车架号不能为空");
+//        }
+//        InsOrder orderObj = insOrderService.queryQuoteno(new Object[]{quoteInfo.getUserId(), quoteInfo.getCarInfo().getFrameNo(), quoteInfo.getQuoteno()});
+//        if (orderObj != null) {
+//            List<InsOrder> listo = insOrderService.selectList(" where quoteno=?", new Object[]{orderObj.getQuoteno()});
+//            String status = "0";
+//            for (InsOrder order : listo) {
+//                if (!"0".equals(order.getOrderstatus())) {
+//                    status = order.getOrderstatus();
+//                }
+//            }
+//            //0报价中 1待核保 2已核保 3核保退回 4核保不通过 5已核保待缴费 6已缴费 7已承保 99已关闭
+//            if ("0".equals(status)) {//关闭订单
+//                insOrderService.closeOrder(orderObj.getOrderno(), "99");
+//            } else if (!"99".equals(status)) {
+//                throw new Exception("此车辆已提交核保，重新报价请先关闭订单，任务号:" + orderObj.getQuoteno());
+//            }
+//        }
+//
+//
+//        insOrder.setUsername(user.getName());
+//        insOrder.setDeptid(user.getDeptId());
+//        SysDept dept = sysDeptService.getById(user.getDeptId());
+//        insOrder.setDeptname(dept == null ? "" : dept.getName());
+//
+//
+//        insOrder.setOwnerinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getOwnerInfo())));
+//        insOrder.setApplyinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getPolicyHolderInfo())));
+//        insOrder.setInsureinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getInsuredPersonInfo())));
+//
+//        insOrder.setInsuredname(quoteInfo.getPolicyHolderInfo().getName());
+//        List<CBITRiskInfoVo> risks = quoteInfo.getRiskList();
+//        for (CBITRiskInfoVo risk : risks) {
+//            if ("0507".equals(risk.getRiskCode())) {//交强
+//                insOrder.setJqstartdate(risk.getStartDate());
+//                insOrder.setJqenddate(risk.getEndDate());
+//            }
+//            if ("0510".equals(risk.getRiskCode())) {//商业
+//                insOrder.setSystartdate(risk.getStartDate());
+//                insOrder.setSyenddate(risk.getEndDate());
+//            }
+//        }
+//        List<KindInfoVo> kinds = quoteInfo.getKindList();
+//        String productId = "";
+//        String productname = "";
+//        //平安：000004
+//        //太平：000005
+//        //太平洋：000007
+//        String ins_zgdd = "";
+//        String inscompany = "";
+//        if (insures.contains("000017")) {
+//            ins_zgdd = "000004";
+//            inscompany = "平安-000017";
+//        } else if (insures.contains("000026")) {
+//            ins_zgdd = "000005";
+//            inscompany = "太平-000026";
+//        } else if (insures.contains("000014")) {
+//            ins_zgdd = "000007";
+//            inscompany = "太平洋-000014";
+//        }
+//
+//
+//        List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
+//                "and exists (select 1 from esm_agreement_prod t2 where t.id=t2.agreeid and t2.authcomcode like ?)", new Object[]{ins_zgdd + "%", "%" + user.getDeptId() + "%"});
+//        if (agreements.size() == 0) {
+//            throw new Exception("不存在有效协议或机构" + user.getDeptId() + "未授权");
+//        }
+//        String agreeid = agreements.get(0).getId();
+//        insOrder.setAgreeid(agreeid);
+//        //匹配协议，获取费用
+//        StringBuffer whereStr = new StringBuffer();
+//        List params = new ArrayList();// where t.agreeid=? and t.productid in ()
+//        whereStr.append("where t.agreeid=? ");
+//        params.add(agreeid);
+//        if (risks.size() == 1 && "0507".equals(risks.get(0).getRiskCode())) {
+//            productId = "ZG01001";
+//            productname = "单交强";
+//            whereStr.append(" and t.productid=?");
+//            params.add(productId);
+//        } else if (risks.size() == 1 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
+//            productId = "ZG01002";
+//            productname = "单三者";
+//            whereStr.append(" and t.productid=?");
+//            params.add(productId);
+//        } else if (risks.size() == 1) {
+//            productId = "ZG01003";
+//            productname = "单商业";
+//            whereStr.append(" and t.productid=?");
+//            params.add(productId);
+//        } else if (risks.size() == 2 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
+//            productId = "ZG01004";
+//            productname = "交强+三者";
+//            whereStr.append(" and t.productid in (?,?)");
+//            params.add("ZG01004");
+//            params.add("ZG01005");
+//        } else {
+//            productId = "ZG01006";
+//            productname = "交强+商业";
+//            whereStr.append(" and t.productid in (?,?)");
+//            params.add("ZG01006");
+//            params.add("ZG01007");
+//        }
+//
+//        double retailRate = countRetail(user.getDeptId(), user.getId());
+//        insOrder.setProductid(productId);
+//        insOrder.setProduct(productname);
+//        List<EsmAgreementProd> agreementProds = esmAgreementProdService.selectList(whereStr.toString(), params.toArray());
+//        for (EsmAgreementProd prod : agreementProds) {
+//            if ("ZG01001".equals(prod.getProductid()) || "ZG01004".equals(prod.getProductid()) || "ZG01006".equals(prod.getProductid())) {
+//
+//                insOrder.setFeerate(prod.getProductrate());//交强手续费比例
+//                insOrder.setJqdiscountrate(prod.getFeerate() - retailRate < 0 ? 0 : prod.getFeerate() - retailRate); //交强优惠比例=业务员绩效-分销费用
+//            } else {
+//
+//                insOrder.setDisrate(prod.getProductrate()); //商业手续费比例
+//                insOrder.setSydiscountrate(prod.getFeerate() - retailRate < 0 ? 0 : prod.getFeerate() - retailRate); //商业优惠比例=业务员绩效-分销费用
+//            }
+//            insOrder.setProductid(prod.getId());
+//        }
+//
+//        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getRiskList())));
+//        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getKindList())));
+//
+//        insOrder.setInscompany(inscompany);
+//        SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        insOrder.setCreatetime(sdfm.format(new Date()));
+//
+//        TrafficPolicy_resp trafficPolicy = quoteRespData.getTrafficPolicy();
+//        BusinessPolicy_resp businessPolicy = quoteRespData.getBusinessPolicy();
+//        BigDecimal vehicleTax = new BigDecimal(0);
+//        if (trafficPolicy != null) {//交强保费
+//            BigDecimal Vehiclemium = trafficPolicy.getPremium();
+//            vehicleTax = trafficPolicy.getVehicleTax().getTotalAmount();
+//            Vehiclemium = Vehiclemium.setScale(2, BigDecimal.ROUND_HALF_UP);
+//            insOrder.setJqpremium(Vehiclemium.doubleValue());
+//            insOrder.setTaxamount(vehicleTax.doubleValue());
+//        }
+//        if (businessPolicy != null) {//商业保费
+//            BigDecimal bd = businessPolicy.getPremium();
+//            bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
+//            double syPremium = bd.doubleValue();
+//            insOrder.setSypremium(syPremium);
+//        }
+//
+//        BigDecimal bd = quoteRespData.getPremium();
+//        bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        insOrder.setSumpremium(bd.doubleValue());
+//        //报价状态 0失败 1成功
+//
+//        BigDecimal bds = new BigDecimal(insOrder.getSypremium());
+//        BigDecimal bd1 = bds.setScale(2, BigDecimal.ROUND_HALF_UP);
+//
+//        insOrder.setSypremium(bd1.doubleValue());
+//        insOrder.setQuotestatus("1");
+//
+//        insOrder.setUserid(user.getId());
+//        logger.info("用户id====" + insOrder.getUserid());
+//
+//        return insOrder;
+//    }
+//
+//    ;
+
+//    /**
+//     * 分销费用统计
+//     *
+//     * @param deptid
+//     * @param userid
+//     * @return
+//     */
+//    public double countRetail(String deptid, String userid) {
+//        double retailRate = 0;
+//
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
+//    }
 }

src/main/java/com/ydtech/modules/ins/controller/InsCBITAPIController.java

@@ -18,7 +18,6 @@ import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.model.cbit.*;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
@@ -79,8 +78,6 @@ public class InsCBITAPIController extends BaseController {
     SysDeptService sysDeptService;
     @Autowired
     EsmRetailService esmRetailService;
-    @Autowired
-    EsmUserInternalService esmUserInternalService;
 
     //接口域名
     @Value("${cbit.url_pre}")
@@ -933,240 +930,240 @@ public class InsCBITAPIController extends BaseController {
         return quoteRespData;
     }
 
-    //报价生成ins_order
-    private InsOrder geneInsOrder(CBITQuoteInfoVo quoteInfo, QuoteRespData quoteRespData, String insures, VehicleModel_QueRen vehicleModel_QueRen) throws Exception {
-        InsOrder insOrder = new InsOrder();
-        String orderno = quoteRespData.getOrderno();
-        insOrder.setOrderno(orderno);
-        insOrder.setQuoteno(String.valueOf(quoteInfo.getQuoteno()));
-        insOrder.setOrderstatus("0");  //0报价 1待核保 2已核保待缴费 3核保退回 4核保不通过
-        insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
-        insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
-
-        insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(vehicleModel_QueRen)));
-        SysUser user = sysUserService.getById(quoteInfo.getUserId());
-        if (user == null) {
-            throw new Exception("userId不存在");
-        }
-        //
-        if (StringUtils.isEmpty(quoteInfo.getCarInfo().getFrameNo())) {
-            throw new Exception("车架号不能为空");
-        }
-        InsOrder orderObj = insOrderService.queryQuoteno(new Object[]{quoteInfo.getUserId(), quoteInfo.getCarInfo().getFrameNo(), quoteInfo.getQuoteno()});
-        if (orderObj != null) {
-            List<InsOrder> listo = insOrderService.selectList(" where quoteno=?", new Object[]{orderObj.getQuoteno()});
-            String status = "0";
-            for (InsOrder order : listo) {
-                if (!"0".equals(order.getOrderstatus())) {
-                    status = order.getOrderstatus();
-                }
-            }
-            //0报价中 1待核保 2已核保 3核保退回 4核保不通过 5已核保待缴费 6已缴费 7已承保 99已关闭
-            if ("0".equals(status)) {//关闭订单
-                insOrderService.closeOrder(orderObj.getOrderno(), "99");
-            } else if (!"99".equals(status)) {
-                throw new Exception("此车辆已提交核保，重新报价请先关闭订单，任务号:" + orderObj.getQuoteno());
-            }
-        }
-
-
-        insOrder.setUsername(user.getName());
-        insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.getById(user.getDeptId());
-        insOrder.setDeptname(dept == null ? "" : dept.getName());
-
-
-        insOrder.setOwnerinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getOwnerInfo())));
-        insOrder.setApplyinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getPolicyHolderInfo())));
-        insOrder.setInsureinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getInsuredPersonInfo())));
-
-        insOrder.setInsuredname(quoteInfo.getPolicyHolderInfo().getName());
-        List<CBITRiskInfoVo> risks = quoteInfo.getRiskList();
-        for (CBITRiskInfoVo risk : risks) {
-            if ("0507".equals(risk.getRiskCode())) {//交强
-                insOrder.setJqstartdate(risk.getStartDate());
-                insOrder.setJqenddate(risk.getEndDate());
-            }
-            if ("0510".equals(risk.getRiskCode())) {//商业
-                insOrder.setSystartdate(risk.getStartDate());
-                insOrder.setSyenddate(risk.getEndDate());
-            }
-        }
-        List<KindInfoVo> kinds = quoteInfo.getKindList();
-        String productId = "";
-        String productname = "";
-        //平安：000004
-        //太平：000005
-        //太平洋：000007
-        String ins_zgdd = "";
-        if (insures.contains("000017")) {
-            ins_zgdd = "000004";
-        } else if (insures.contains("000026")) {
-            ins_zgdd = "000005";
-        } else if (insures.contains("000014")) {
-            ins_zgdd = "000007";
-        }
-
-
-        List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
-                "and exists (select 1 from esm_agreement_prod t2 where t.id=t2.agreeid and t2.authcomcode like ?)", new Object[]{ins_zgdd + "%", "%" + user.getDeptId() + "%"});
-        if (agreements.size() == 0) {
-            throw new Exception("不存在有效协议或机构" + user.getDeptId() + "未授权");
-        }
-        String agreeid = agreements.get(0).getId();
-        insOrder.setAgreeid(agreeid);
-        //匹配协议，获取费用
-        StringBuffer whereStr = new StringBuffer();
-        List params = new ArrayList();// where t.agreeid=? and t.productid in ()
-        whereStr.append("where t.agreeid=? ");
-        params.add(agreeid);
-        if (risks.size() == 1 && "0507".equals(risks.get(0).getRiskCode())) {
-            productId = "ZG01001";
-            productname = "单交强";
-            whereStr.append(" and t.productid=?");
-            params.add(productId);
-        } else if (risks.size() == 1 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
-            productId = "ZG01002";
-            productname = "单三者";
-            whereStr.append(" and t.productid=?");
-            params.add(productId);
-        } else if (risks.size() == 1) {
-            productId = "ZG01003";
-            productname = "单商业";
-            whereStr.append(" and t.productid=?");
-            params.add(productId);
-        } else if (risks.size() == 2 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
-            productId = "ZG01004";
-            productname = "交强+三者";
-            whereStr.append(" and t.productid in (?,?)");
-            params.add("ZG01004");
-            params.add("ZG01005");
-        } else {
-            productId = "ZG01006";
-            productname = "交强+商业";
-            whereStr.append(" and t.productid in (?,?)");
-            params.add("ZG01006");
-            params.add("ZG01007");
-        }
-
-        double retailRate = countRetail(user.getDeptId(), user.getId());
-        insOrder.setProductid(productId);
-        insOrder.setProduct(productname);
-        List<EsmAgreementProd> agreementProds = esmAgreementProdService.selectList(whereStr.toString(), params.toArray());
-        for (EsmAgreementProd prod : agreementProds) {
-            if ("ZG01001".equals(prod.getProductid()) || "ZG01004".equals(prod.getProductid()) || "ZG01006".equals(prod.getProductid())) {
-
-                insOrder.setFeerate(prod.getProductrate());//交强手续费比例
-                insOrder.setJqdiscountrate(prod.getFeerate() - retailRate); //交强优惠比例=业务员绩效-分销费用
-            } else {
-
-                insOrder.setDisrate(prod.getProductrate()); //商业手续费比例
-                insOrder.setSydiscountrate(prod.getFeerate() - retailRate); //商业优惠比例=业务员绩效-分销费用
-
-
-            }
-            insOrder.setProductid(prod.getId());
-        }
-
-        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getRiskList())));
-        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getKindList())));
-
-        insOrder.setInscompany(insures);
-        SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        insOrder.setCreatetime(sdfm.format(new Date()));
-
-        TrafficPolicy_resp trafficPolicy = quoteRespData.getTrafficPolicy();
-        BusinessPolicy_resp businessPolicy = quoteRespData.getBusinessPolicy();
-        BigDecimal vehicleTax = new BigDecimal(0);
-        if (trafficPolicy != null) {//交强保费
-            BigDecimal Vehiclemium = trafficPolicy.getPremium();
-            vehicleTax = trafficPolicy.getVehicleTax().getTotalAmount();
-            Vehiclemium = Vehiclemium.setScale(2, BigDecimal.ROUND_HALF_UP);
-            insOrder.setJqpremium(Vehiclemium.doubleValue());
-            insOrder.setTaxamount(vehicleTax.doubleValue());
-        }
-        if (businessPolicy != null) {//商业保费
-            BigDecimal bd = businessPolicy.getPremium();
-            bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
-            double syPremium = bd.doubleValue();
-            insOrder.setSypremium(syPremium);
-        }
-
-        BigDecimal bd = quoteRespData.getPremium();
-        bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
-        insOrder.setSumpremium(bd.doubleValue());
-        //报价状态 0失败 1成功
-
-        BigDecimal bds = new BigDecimal(insOrder.getSypremium());
-        BigDecimal bd1 = bds.setScale(2, BigDecimal.ROUND_HALF_UP);
-
-        insOrder.setSypremium(bd1.doubleValue());
-        insOrder.setQuotestatus("1");
-
-        insOrder.setUserid(user.getId());
-        logger.info("用户id====" + insOrder.getUserid());
-//        insOrderService.insert(insOrder);
-
-        //插入轨迹表
-        /*InsTaskHistory history = new InsTaskHistory();
-        history.setId(String.valueOf(new Date().getTime()));
-        history.setCompany(insOrder.getInscompany());
-        history.setTaskid(insOrder.getOrderno());
-        history.setOperatorid(insOrder.getUserid());
-        history.setOperator(insOrder.getUsername());
-        history.setCreatetime(sdfm.format(new Date()));
-        history.setOperator(insOrder.getUsername());
-        history.setStatus("0");
-        history.setRemark("报价中");
-        insTaskHistoryService.insert(history);
-*/
-        return insOrder;
-    }
-
-    ;
-
-    /**
-     * 分销费用统计
-     *
-     * @param deptid
-     * @param userid
-     * @return
-     */
-    public double countRetail(String deptid, String userid) {
-        double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
-        return retailRate;
-    }
+//    //报价生成ins_order
+//    private InsOrder geneInsOrder(CBITQuoteInfoVo quoteInfo, QuoteRespData quoteRespData, String insures, VehicleModel_QueRen vehicleModel_QueRen) throws Exception {
+//        InsOrder insOrder = new InsOrder();
+//        String orderno = quoteRespData.getOrderno();
+//        insOrder.setOrderno(orderno);
+//        insOrder.setQuoteno(String.valueOf(quoteInfo.getQuoteno()));
+//        insOrder.setOrderstatus("0");  //0报价 1待核保 2已核保待缴费 3核保退回 4核保不通过
+//        insOrder.setFrameNo(quoteInfo.getCarInfo().getFrameNo());
+//        insOrder.setLicenseNo(quoteInfo.getCarInfo().getLicenseNo());
+//
+//        insOrder.setCarinfo(JSONObject.parseObject(JSONObject.toJSONString(vehicleModel_QueRen)));
+//        SysUser user = sysUserService.getById(quoteInfo.getUserId());
+//        if (user == null) {
+//            throw new Exception("userId不存在");
+//        }
+//        //
+//        if (StringUtils.isEmpty(quoteInfo.getCarInfo().getFrameNo())) {
+//            throw new Exception("车架号不能为空");
+//        }
+//        InsOrder orderObj = insOrderService.queryQuoteno(new Object[]{quoteInfo.getUserId(), quoteInfo.getCarInfo().getFrameNo(), quoteInfo.getQuoteno()});
+//        if (orderObj != null) {
+//            List<InsOrder> listo = insOrderService.selectList(" where quoteno=?", new Object[]{orderObj.getQuoteno()});
+//            String status = "0";
+//            for (InsOrder order : listo) {
+//                if (!"0".equals(order.getOrderstatus())) {
+//                    status = order.getOrderstatus();
+//                }
+//            }
+//            //0报价中 1待核保 2已核保 3核保退回 4核保不通过 5已核保待缴费 6已缴费 7已承保 99已关闭
+//            if ("0".equals(status)) {//关闭订单
+//                insOrderService.closeOrder(orderObj.getOrderno(), "99");
+//            } else if (!"99".equals(status)) {
+//                throw new Exception("此车辆已提交核保，重新报价请先关闭订单，任务号:" + orderObj.getQuoteno());
+//            }
+//        }
+//
+//
+//        insOrder.setUsername(user.getName());
+//        insOrder.setDeptid(user.getDeptId());
+//        SysDept dept = sysDeptService.getById(user.getDeptId());
+//        insOrder.setDeptname(dept == null ? "" : dept.getName());
+//
+//
+//        insOrder.setOwnerinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getOwnerInfo())));
+//        insOrder.setApplyinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getPolicyHolderInfo())));
+//        insOrder.setInsureinfo(JSONObject.parseObject(JSONObject.toJSONString(quoteInfo.getInsuredPersonInfo())));
+//
+//        insOrder.setInsuredname(quoteInfo.getPolicyHolderInfo().getName());
+//        List<CBITRiskInfoVo> risks = quoteInfo.getRiskList();
+//        for (CBITRiskInfoVo risk : risks) {
+//            if ("0507".equals(risk.getRiskCode())) {//交强
+//                insOrder.setJqstartdate(risk.getStartDate());
+//                insOrder.setJqenddate(risk.getEndDate());
+//            }
+//            if ("0510".equals(risk.getRiskCode())) {//商业
+//                insOrder.setSystartdate(risk.getStartDate());
+//                insOrder.setSyenddate(risk.getEndDate());
+//            }
+//        }
+//        List<KindInfoVo> kinds = quoteInfo.getKindList();
+//        String productId = "";
+//        String productname = "";
+//        //平安：000004
+//        //太平：000005
+//        //太平洋：000007
+//        String ins_zgdd = "";
+//        if (insures.contains("000017")) {
+//            ins_zgdd = "000004";
+//        } else if (insures.contains("000026")) {
+//            ins_zgdd = "000005";
+//        } else if (insures.contains("000014")) {
+//            ins_zgdd = "000007";
+//        }
+//
+//
+//        List<EsmAgreement> agreements = esmAgreementService.selectList(" where t.agreestatus='1' and t.insure1 like ? " +
+//                "and exists (select 1 from esm_agreement_prod t2 where t.id=t2.agreeid and t2.authcomcode like ?)", new Object[]{ins_zgdd + "%", "%" + user.getDeptId() + "%"});
+//        if (agreements.size() == 0) {
+//            throw new Exception("不存在有效协议或机构" + user.getDeptId() + "未授权");
+//        }
+//        String agreeid = agreements.get(0).getId();
+//        insOrder.setAgreeid(agreeid);
+//        //匹配协议，获取费用
+//        StringBuffer whereStr = new StringBuffer();
+//        List params = new ArrayList();// where t.agreeid=? and t.productid in ()
+//        whereStr.append("where t.agreeid=? ");
+//        params.add(agreeid);
+//        if (risks.size() == 1 && "0507".equals(risks.get(0).getRiskCode())) {
+//            productId = "ZG01001";
+//            productname = "单交强";
+//            whereStr.append(" and t.productid=?");
+//            params.add(productId);
+//        } else if (risks.size() == 1 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
+//            productId = "ZG01002";
+//            productname = "单三者";
+//            whereStr.append(" and t.productid=?");
+//            params.add(productId);
+//        } else if (risks.size() == 1) {
+//            productId = "ZG01003";
+//            productname = "单商业";
+//            whereStr.append(" and t.productid=?");
+//            params.add(productId);
+//        } else if (risks.size() == 2 && kinds.size() == 1 && "B".equals(kinds.get(0).getKindCode())) {
+//            productId = "ZG01004";
+//            productname = "交强+三者";
+//            whereStr.append(" and t.productid in (?,?)");
+//            params.add("ZG01004");
+//            params.add("ZG01005");
+//        } else {
+//            productId = "ZG01006";
+//            productname = "交强+商业";
+//            whereStr.append(" and t.productid in (?,?)");
+//            params.add("ZG01006");
+//            params.add("ZG01007");
+//        }
+//
+//        double retailRate = countRetail(user.getDeptId(), user.getId());
+//        insOrder.setProductid(productId);
+//        insOrder.setProduct(productname);
+//        List<EsmAgreementProd> agreementProds = esmAgreementProdService.selectList(whereStr.toString(), params.toArray());
+//        for (EsmAgreementProd prod : agreementProds) {
+//            if ("ZG01001".equals(prod.getProductid()) || "ZG01004".equals(prod.getProductid()) || "ZG01006".equals(prod.getProductid())) {
+//
+//                insOrder.setFeerate(prod.getProductrate());//交强手续费比例
+//                insOrder.setJqdiscountrate(prod.getFeerate() - retailRate); //交强优惠比例=业务员绩效-分销费用
+//            } else {
+//
+//                insOrder.setDisrate(prod.getProductrate()); //商业手续费比例
+//                insOrder.setSydiscountrate(prod.getFeerate() - retailRate); //商业优惠比例=业务员绩效-分销费用
+//
+//
+//            }
+//            insOrder.setProductid(prod.getId());
+//        }
+//
+//        insOrder.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getRiskList())));
+//        insOrder.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteInfo.getKindList())));
+//
+//        insOrder.setInscompany(insures);
+//        SimpleDateFormat sdfm = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        insOrder.setCreatetime(sdfm.format(new Date()));
+//
+//        TrafficPolicy_resp trafficPolicy = quoteRespData.getTrafficPolicy();
+//        BusinessPolicy_resp businessPolicy = quoteRespData.getBusinessPolicy();
+//        BigDecimal vehicleTax = new BigDecimal(0);
+//        if (trafficPolicy != null) {//交强保费
+//            BigDecimal Vehiclemium = trafficPolicy.getPremium();
+//            vehicleTax = trafficPolicy.getVehicleTax().getTotalAmount();
+//            Vehiclemium = Vehiclemium.setScale(2, BigDecimal.ROUND_HALF_UP);
+//            insOrder.setJqpremium(Vehiclemium.doubleValue());
+//            insOrder.setTaxamount(vehicleTax.doubleValue());
+//        }
+//        if (businessPolicy != null) {//商业保费
+//            BigDecimal bd = businessPolicy.getPremium();
+//            bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
+//            double syPremium = bd.doubleValue();
+//            insOrder.setSypremium(syPremium);
+//        }
+//
+//        BigDecimal bd = quoteRespData.getPremium();
+//        bd = bd.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        insOrder.setSumpremium(bd.doubleValue());
+//        //报价状态 0失败 1成功
+//
+//        BigDecimal bds = new BigDecimal(insOrder.getSypremium());
+//        BigDecimal bd1 = bds.setScale(2, BigDecimal.ROUND_HALF_UP);
+//
+//        insOrder.setSypremium(bd1.doubleValue());
+//        insOrder.setQuotestatus("1");
+//
+//        insOrder.setUserid(user.getId());
+//        logger.info("用户id====" + insOrder.getUserid());
+////        insOrderService.insert(insOrder);
+//
+//        //插入轨迹表
+//        /*InsTaskHistory history = new InsTaskHistory();
+//        history.setId(String.valueOf(new Date().getTime()));
+//        history.setCompany(insOrder.getInscompany());
+//        history.setTaskid(insOrder.getOrderno());
+//        history.setOperatorid(insOrder.getUserid());
+//        history.setOperator(insOrder.getUsername());
+//        history.setCreatetime(sdfm.format(new Date()));
+//        history.setOperator(insOrder.getUsername());
+//        history.setStatus("0");
+//        history.setRemark("报价中");
+//        insTaskHistoryService.insert(history);
+//*/
+//        return insOrder;
+//    }
+//
+//    ;
+
+//    /**
+//     * 分销费用统计
+//     *
+//     * @param deptid
+//     * @param userid
+//     * @return
+//     */
+//    public double countRetail(String deptid, String userid) {
+//        double retailRate = 0;
+//
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
+//    }
 
     private Vehicle getVehicle(CarInfoVo carInfo, VehicleModel vehicleModel, Date startdate, String insures) {
         Vehicle vehicle = new Vehicle();//车辆信息

src/main/java/com/ydtech/modules/ins/controller/InsHengbangController.java

@@ -13,7 +13,6 @@ import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.service.*;
@@ -58,8 +57,6 @@ public class InsHengbangController {
 
     @Autowired
     EsmRetailService esmRetailService;
-    @Autowired
-    EsmUserInternalService esmUserInternalService;
 
     //    @GetMapping("/AIlogin")
     public void AIlogin() throws Exception {
@@ -769,37 +766,38 @@ public class InsHengbangController {
      */
     public double countRetail(String deptid, String userid) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 }

src/main/java/com/ydtech/modules/ins/controller/InsHuanongController.java

@@ -14,7 +14,6 @@ import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.service.HuanongService;
@@ -58,8 +57,6 @@ public class InsHuanongController {
     EsmAgreementProdService esmAgreementProdService;
     @Autowired
     EsmRetailService esmRetailService;
-    @Autowired
-    EsmUserInternalService esmUserInternalService;
 
     //    @GetMapping("/login")
     public void login() {
@@ -561,38 +558,39 @@ public class InsHuanongController {
      */
     public double countRetail(String deptid, String userid) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 
     @GetMapping("/vinQuery")

src/main/java/com/ydtech/modules/ins/controller/InsOrderController.java

@@ -65,8 +65,6 @@ public class InsOrderController extends BaseController {
     @Autowired
     EsmRetailService esmRetailService;
     @Autowired
-    EsmUserInternalService esmUserInternalService;
-    @Autowired
     InsTaskHistoryService insTaskHistoryService;
     @Autowired
     InsOrderTaskService insOrderTaskService;
@@ -1326,91 +1324,92 @@ public class InsOrderController extends BaseController {
      */
     public double saveRetail(InsOrder order) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{order.getDeptid(), "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(order.getUserid());
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-            Integer count = insCommissionService.count(" where orderno=? ", new Object[]{order.getOrderno()});
-            if (count > 0) {
-                Integer comm = insCommissionService.delete(order.getOrderno());
-
-            }
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                InsCommission commission = new InsCommission();
-                commission.setOrderno(order.getOrderno());
-                commission.setQuoteno(order.getQuoteno());
-                commission.setRefereescode(users.get(0).getId());
-                commission.setRefereesname(users.get(0).getName());
-                double rate = rateList.get(0) * 0.01;
-                commission.setCommissionrate(rate);
-                BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                commission.setCommissionamount(amount.doubleValue());
-                commission.setLevel("1");
-                commission.setAuditstatus("0");  //0未审核 1已审核
-                commission.setSettlestatus("0"); //0未结算 1已结算
-                commission.setInsuredtime(order.getAudittime()); //承保确认时间
-
-                insCommissionService.insert(commission);
-
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    InsCommission commission = new InsCommission();
-                    commission.setOrderno(order.getOrderno());
-                    commission.setQuoteno(order.getQuoteno());
-                    commission.setRefereescode(users.get(i).getId());
-                    commission.setRefereesname(users.get(i).getName());
-                    double rate = rateList.get(i) * 0.01;
-                    commission.setCommissionrate(rate);
-                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                    commission.setCommissionamount(amount.doubleValue());
-                    commission.setLevel(String.valueOf(i + 1));
-                    commission.setAuditstatus("0");  //0未审核 1已审核
-                    commission.setSettlestatus("0"); //0未结算 1已结算
-                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                    insCommissionService.insert(commission);
-
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    InsCommission commission = new InsCommission();
-                    commission.setOrderno(order.getOrderno());
-                    commission.setQuoteno(order.getQuoteno());
-                    commission.setRefereescode(users.get(i).getId());
-                    commission.setRefereesname(users.get(i).getName());
-                    double rate = rateList.get(i) * 0.01;
-                    commission.setCommissionrate(rate);
-                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                    commission.setCommissionamount(amount.doubleValue());
-                    commission.setLevel(String.valueOf(i + 1));
-                    commission.setAuditstatus("0");  //0未审核 1已审核
-                    commission.setSettlestatus("0"); //0未结算 1已结算
-                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                    insCommissionService.insert(commission);
-
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{order.getDeptid(), "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(order.getUserid());
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//            Integer count = insCommissionService.count(" where orderno=? ", new Object[]{order.getOrderno()});
+//            if (count > 0) {
+//                Integer comm = insCommissionService.delete(order.getOrderno());
+//
+//            }
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                InsCommission commission = new InsCommission();
+//                commission.setOrderno(order.getOrderno());
+//                commission.setQuoteno(order.getQuoteno());
+//                commission.setRefereescode(users.get(0).getId());
+//                commission.setRefereesname(users.get(0).getName());
+//                double rate = rateList.get(0) * 0.01;
+//                commission.setCommissionrate(rate);
+//                BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                commission.setCommissionamount(amount.doubleValue());
+//                commission.setLevel("1");
+//                commission.setAuditstatus("0");  //0未审核 1已审核
+//                commission.setSettlestatus("0"); //0未结算 1已结算
+//                commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//
+//                insCommissionService.insert(commission);
+//
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    InsCommission commission = new InsCommission();
+//                    commission.setOrderno(order.getOrderno());
+//                    commission.setQuoteno(order.getQuoteno());
+//                    commission.setRefereescode(users.get(i).getId());
+//                    commission.setRefereesname(users.get(i).getName());
+//                    double rate = rateList.get(i) * 0.01;
+//                    commission.setCommissionrate(rate);
+//                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                    commission.setCommissionamount(amount.doubleValue());
+//                    commission.setLevel(String.valueOf(i + 1));
+//                    commission.setAuditstatus("0");  //0未审核 1已审核
+//                    commission.setSettlestatus("0"); //0未结算 1已结算
+//                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                    insCommissionService.insert(commission);
+//
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    InsCommission commission = new InsCommission();
+//                    commission.setOrderno(order.getOrderno());
+//                    commission.setQuoteno(order.getQuoteno());
+//                    commission.setRefereescode(users.get(i).getId());
+//                    commission.setRefereesname(users.get(i).getName());
+//                    double rate = rateList.get(i) * 0.01;
+//                    commission.setCommissionrate(rate);
+//                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                    commission.setCommissionamount(amount.doubleValue());
+//                    commission.setLevel(String.valueOf(i + 1));
+//                    commission.setAuditstatus("0");  //0未审核 1已审核
+//                    commission.setSettlestatus("0"); //0未结算 1已结算
+//                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                    insCommissionService.insert(commission);
+//
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 
     /**

src/main/java/com/ydtech/modules/ins/controller/InsPayApplyController.java

@@ -9,12 +9,10 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
-import com.ydtech.modules.esm.model.EsmUserInternal;
 import com.ydtech.modules.esm.model.vo.ExtensionVO;
 import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
 import com.ydtech.modules.esm.model.vo.TeamUserVO;
 import com.ydtech.modules.esm.model.vo.TeamUserVONew;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.model.InsPayApply;
 import com.ydtech.modules.ins.model.vo.AccountVo;
@@ -52,8 +50,6 @@ public class InsPayApplyController extends BaseController {
     @Autowired
     SysDeptService sysDeptService;
     @Autowired
-    EsmUserInternalService esmUserInternalService;
-    @Autowired
     InsCommissionService insCommissionService;
     @Autowired
     InsDeptFeeService insDeptFeeService;
@@ -297,58 +293,58 @@ public class InsPayApplyController extends BaseController {
         return httpResult;
     }
 
-    /**
-     * 推广费提现申请
-     *
-     * @param userid
-     * @param amount
-     * @return
-     */
-    @PostMapping(value = "/extendApply")
-    public HttpResult extendApply(@RequestParam String userid, @RequestParam double amount) {
-        HttpResult httpResult = new HttpResult();
-        //推广账户总金额
-        double sumAmount = insCommissionService.sumAmount(" where t.refereescode=? and t.auditstatus=?", new Object[]{userid, "1"});
-        //已提现金额
-        double totalAmount = insPayApplyService.sumAmount(" where t.userid=? and t.applytype=?", new Object[]{userid, "B"});
-        double accountBalance = sumAmount - totalAmount;
-
-        if (amount > accountBalance) {
-            return HttpResult.error("可提现余额不足");
-        }
-        InsPayApply apply = new InsPayApply();
-        String applyno = IdGenerate.nextId();
-        SysUser user = sysUserService.getById(userid);
-        if (user == null) {
-            httpResult.setMsg("userId不存在");
-            return httpResult;
-        }
-        apply.setApplyno(applyno);
-        apply.setUserid(userid);
-        apply.setUsername(user.getName());
-        apply.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.getById(user.getDeptId());
-        apply.setDeptname(dept == null ? "" : dept.getName());
-        BigDecimal decimal = new BigDecimal(accountBalance);
-        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
-        apply.setAccountbalance(decimal.doubleValue());
-        apply.setApplyamount(amount);
-        decimal = new BigDecimal(accountBalance - amount);
-        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
-        apply.setBalance(decimal.doubleValue());
-        apply.setDisrate("");
-        EsmUserInternal userInternal = esmUserInternalService.getById(userid);
-        apply.setBankname(userInternal.getBankname());
-        apply.setAccountno(userInternal.getAccountno());
-        apply.setApplystatus("0"); //0申请中 1支付中 2已支付
-        apply.setApplytype("B");  //A跟单绩效  B推广佣金
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        apply.setCreatetime(sdf.format(new Date()));
-
-        insPayApplyService.insert(apply);
-
-        return HttpResult.ok("保存成功");
-    }
+//    /**
+//     * 推广费提现申请
+//     *
+//     * @param userid
+//     * @param amount
+//     * @return
+//     */
+//    @PostMapping(value = "/extendApply")
+//    public HttpResult extendApply(@RequestParam String userid, @RequestParam double amount) {
+//        HttpResult httpResult = new HttpResult();
+//        //推广账户总金额
+//        double sumAmount = insCommissionService.sumAmount(" where t.refereescode=? and t.auditstatus=?", new Object[]{userid, "1"});
+//        //已提现金额
+//        double totalAmount = insPayApplyService.sumAmount(" where t.userid=? and t.applytype=?", new Object[]{userid, "B"});
+//        double accountBalance = sumAmount - totalAmount;
+//
+//        if (amount > accountBalance) {
+//            return HttpResult.error("可提现余额不足");
+//        }
+//        InsPayApply apply = new InsPayApply();
+//        String applyno = IdGenerate.nextId();
+//        SysUser user = sysUserService.getById(userid);
+//        if (user == null) {
+//            httpResult.setMsg("userId不存在");
+//            return httpResult;
+//        }
+//        apply.setApplyno(applyno);
+//        apply.setUserid(userid);
+//        apply.setUsername(user.getName());
+//        apply.setDeptid(user.getDeptId());
+//        SysDept dept = sysDeptService.getById(user.getDeptId());
+//        apply.setDeptname(dept == null ? "" : dept.getName());
+//        BigDecimal decimal = new BigDecimal(accountBalance);
+//        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        apply.setAccountbalance(decimal.doubleValue());
+//        apply.setApplyamount(amount);
+//        decimal = new BigDecimal(accountBalance - amount);
+//        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        apply.setBalance(decimal.doubleValue());
+//        apply.setDisrate("");
+//        EsmUserInternal userInternal = esmUserInternalService.getById(userid);
+//        apply.setBankname(userInternal.getBankname());
+//        apply.setAccountno(userInternal.getAccountno());
+//        apply.setApplystatus("0"); //0申请中 1支付中 2已支付
+//        apply.setApplytype("B");  //A跟单绩效  B推广佣金
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        apply.setCreatetime(sdf.format(new Date()));
+//
+//        insPayApplyService.insert(apply);
+//
+//        return HttpResult.ok("保存成功");
+//    }
 
     /**
      * 提现账户
@@ -382,57 +378,57 @@ public class InsPayApplyController extends BaseController {
         return httpResult;
     }
 
-    /**
-     * 提现申请
-     *
-     * @param userid
-     * @param amount
-     * @return
-     */
-    @PostMapping(value = "/applyPay")
-    public HttpResult applyPay(@RequestParam String userid, @RequestParam double amount) {
-        HttpResult httpResult = new HttpResult();
-        //账户总金额
-        double sumAmount = insCompanyFeeService.sumAmount(" where t.userid=? and t.settlestatus=?", new Object[]{userid, "1"});
-        //已提现金额
-        double applyAmount = insPayApplyService.sumAmount(" where t.userid=? and t.applytype=?", new Object[]{userid, "A"});
-        double accountBalance = sumAmount - applyAmount;
-        if (amount > accountBalance) {
-            return HttpResult.error("可提现余额不足");
-        }
-        InsPayApply apply = new InsPayApply();
-        String applyno = IdGenerate.nextId();
-        SysUser user = sysUserService.getById(userid);
-        if (user == null) {
-            httpResult.setMsg("userId不存在");
-            return httpResult;
-        }
-        apply.setApplyno(applyno);
-        apply.setUserid(userid);
-        apply.setUsername(user.getName());
-        apply.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.getById(user.getDeptId());
-        apply.setDeptname(dept == null ? "" : dept.getName());
-        BigDecimal decimal = new BigDecimal(accountBalance);
-        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
-        apply.setAccountbalance(decimal.doubleValue());
-        apply.setApplyamount(amount);
-        decimal = new BigDecimal(accountBalance - amount);
-        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
-        apply.setBalance(decimal.doubleValue());
-        apply.setDisrate("");
-        EsmUserInternal userInternal = esmUserInternalService.getById(userid);
-        apply.setBankname(userInternal.getBankname());
-        apply.setAccountno(userInternal.getAccountno());
-        apply.setApplystatus("0"); //0申请中 1支付中 2已支付
-        apply.setApplytype("A");  //A跟单绩效  B推广佣金
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        apply.setCreatetime(sdf.format(new Date()));
-
-        insPayApplyService.insert(apply);
-
-        return HttpResult.ok("保存成功");
-    }
+//    /**
+//     * 提现申请
+//     *
+//     * @param userid
+//     * @param amount
+//     * @return
+//     */
+//    @PostMapping(value = "/applyPay")
+//    public HttpResult applyPay(@RequestParam String userid, @RequestParam double amount) {
+//        HttpResult httpResult = new HttpResult();
+//        //账户总金额
+//        double sumAmount = insCompanyFeeService.sumAmount(" where t.userid=? and t.settlestatus=?", new Object[]{userid, "1"});
+//        //已提现金额
+//        double applyAmount = insPayApplyService.sumAmount(" where t.userid=? and t.applytype=?", new Object[]{userid, "A"});
+//        double accountBalance = sumAmount - applyAmount;
+//        if (amount > accountBalance) {
+//            return HttpResult.error("可提现余额不足");
+//        }
+//        InsPayApply apply = new InsPayApply();
+//        String applyno = IdGenerate.nextId();
+//        SysUser user = sysUserService.getById(userid);
+//        if (user == null) {
+//            httpResult.setMsg("userId不存在");
+//            return httpResult;
+//        }
+//        apply.setApplyno(applyno);
+//        apply.setUserid(userid);
+//        apply.setUsername(user.getName());
+//        apply.setDeptid(user.getDeptId());
+//        SysDept dept = sysDeptService.getById(user.getDeptId());
+//        apply.setDeptname(dept == null ? "" : dept.getName());
+//        BigDecimal decimal = new BigDecimal(accountBalance);
+//        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        apply.setAccountbalance(decimal.doubleValue());
+//        apply.setApplyamount(amount);
+//        decimal = new BigDecimal(accountBalance - amount);
+//        decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
+//        apply.setBalance(decimal.doubleValue());
+//        apply.setDisrate("");
+//        EsmUserInternal userInternal = esmUserInternalService.getById(userid);
+//        apply.setBankname(userInternal.getBankname());
+//        apply.setAccountno(userInternal.getAccountno());
+//        apply.setApplystatus("0"); //0申请中 1支付中 2已支付
+//        apply.setApplytype("A");  //A跟单绩效  B推广佣金
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        apply.setCreatetime(sdf.format(new Date()));
+//
+//        insPayApplyService.insert(apply);
+//
+//        return HttpResult.ok("保存成功");
+//    }
 
     /**
      * 提现审核

src/main/java/com/ydtech/modules/ins/controller/InsRenbaoController.java

@@ -13,7 +13,6 @@ import com.ydtech.modules.esm.model.EsmRetail;
 import com.ydtech.modules.esm.service.EsmAgreementProdService;
 import com.ydtech.modules.esm.service.EsmAgreementService;
 import com.ydtech.modules.esm.service.EsmRetailService;
-import com.ydtech.modules.esm.service.EsmUserInternalService;
 import com.ydtech.modules.ins.model.*;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.service.InsOrderService;
@@ -52,8 +51,6 @@ public class InsRenbaoController {
     EsmAgreementProdService esmAgreementProdService;
     @Autowired
     EsmRetailService esmRetailService;
-    @Autowired
-    EsmUserInternalService esmUserInternalService;
 
     //    @GetMapping("/login")
     public void login() {
@@ -377,38 +374,39 @@ public class InsRenbaoController {
      */
     public double countRetail(String deptid, String userid) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 
     //请求参数转换

src/main/java/com/ydtech/modules/ins/controller/InsTiananController.java

@@ -61,8 +61,6 @@ public class InsTiananController {
     EsmAgreementProdService esmAgreementProdService;
     @Autowired
     EsmRetailService esmRetailService;
-    @Autowired
-    EsmUserInternalService esmUserInternalService;
 
     //    @GetMapping("/login")
     public void login() {
@@ -876,38 +874,39 @@ public class InsTiananController {
      */
     public double countRetail(String deptid, String userid) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 
 
@@ -1002,85 +1001,86 @@ public class InsTiananController {
      */
     public double saveRetail(InsOrder order) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{order.getDeptid(), "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(order.getUserid());
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                InsCommission commission = new InsCommission();
-                commission.setOrderno(order.getOrderno());
-                commission.setQuoteno(order.getQuoteno());
-                commission.setRefereescode(users.get(0).getId());
-                commission.setRefereesname(users.get(0).getName());
-                double rate = rateList.get(0) * 0.01;
-                commission.setCommissionrate(rate);
-                BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                commission.setCommissionamount(amount.doubleValue());
-                commission.setLevel("1");
-                commission.setAuditstatus("0");  //0未审核 1已审核
-                commission.setSettlestatus("0"); //0未结算 1已结算
-                commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                insCommissionService.insert(commission);
-
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    InsCommission commission = new InsCommission();
-                    commission.setOrderno(order.getOrderno());
-                    commission.setQuoteno(order.getQuoteno());
-                    commission.setRefereescode(users.get(i).getId());
-                    commission.setRefereesname(users.get(i).getName());
-                    double rate = rateList.get(i) * 0.01;
-                    commission.setCommissionrate(rate);
-                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                    commission.setCommissionamount(amount.doubleValue());
-                    commission.setLevel(String.valueOf(i + 1));
-                    commission.setAuditstatus("0");  //0未审核 1已审核
-                    commission.setSettlestatus("0"); //0未结算 1已结算
-                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                    insCommissionService.insert(commission);
-
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    InsCommission commission = new InsCommission();
-                    commission.setOrderno(order.getOrderno());
-                    commission.setQuoteno(order.getQuoteno());
-                    commission.setRefereescode(users.get(i).getId());
-                    commission.setRefereesname(users.get(i).getName());
-                    double rate = rateList.get(i) * 0.01;
-                    commission.setCommissionrate(rate);
-                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
-                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
-                    commission.setCommissionamount(amount.doubleValue());
-                    commission.setLevel(String.valueOf(i + 1));
-                    commission.setAuditstatus("0");  //0未审核 1已审核
-                    commission.setSettlestatus("0"); //0未结算 1已结算
-                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
-                    insCommissionService.insert(commission);
-
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{order.getDeptid(), "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(order.getUserid());
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                InsCommission commission = new InsCommission();
+//                commission.setOrderno(order.getOrderno());
+//                commission.setQuoteno(order.getQuoteno());
+//                commission.setRefereescode(users.get(0).getId());
+//                commission.setRefereesname(users.get(0).getName());
+//                double rate = rateList.get(0) * 0.01;
+//                commission.setCommissionrate(rate);
+//                BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                commission.setCommissionamount(amount.doubleValue());
+//                commission.setLevel("1");
+//                commission.setAuditstatus("0");  //0未审核 1已审核
+//                commission.setSettlestatus("0"); //0未结算 1已结算
+//                commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                insCommissionService.insert(commission);
+//
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    InsCommission commission = new InsCommission();
+//                    commission.setOrderno(order.getOrderno());
+//                    commission.setQuoteno(order.getQuoteno());
+//                    commission.setRefereescode(users.get(i).getId());
+//                    commission.setRefereesname(users.get(i).getName());
+//                    double rate = rateList.get(i) * 0.01;
+//                    commission.setCommissionrate(rate);
+//                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                    commission.setCommissionamount(amount.doubleValue());
+//                    commission.setLevel(String.valueOf(i + 1));
+//                    commission.setAuditstatus("0");  //0未审核 1已审核
+//                    commission.setSettlestatus("0"); //0未结算 1已结算
+//                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                    insCommissionService.insert(commission);
+//
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    InsCommission commission = new InsCommission();
+//                    commission.setOrderno(order.getOrderno());
+//                    commission.setQuoteno(order.getQuoteno());
+//                    commission.setRefereescode(users.get(i).getId());
+//                    commission.setRefereesname(users.get(i).getName());
+//                    double rate = rateList.get(i) * 0.01;
+//                    commission.setCommissionrate(rate);
+//                    BigDecimal amount = new BigDecimal((order.getJqpremium() + order.getSypremium()) * rate);
+//                    amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP);
+//                    commission.setCommissionamount(amount.doubleValue());
+//                    commission.setLevel(String.valueOf(i + 1));
+//                    commission.setAuditstatus("0");  //0未审核 1已审核
+//                    commission.setSettlestatus("0"); //0未结算 1已结算
+//                    commission.setInsuredtime(order.getAudittime()); //承保确认时间
+//                    insCommissionService.insert(commission);
+//
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 }

src/main/java/com/ydtech/modules/inv/controller/InvInvoiceInfoController.java

@@ -10,7 +10,10 @@ import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.inv.model.InvInvoiceInfo;
+import com.ydtech.modules.inv.model.InvInvoiceInfoInOut;
+import com.ydtech.modules.inv.model.dto.InvInvoiceInfoDto;
 import com.ydtech.modules.inv.model.vo.req.InvInvoiceInfoReqVO;
+import com.ydtech.modules.inv.service.InvInvoiceInfoInOutService;
 import com.ydtech.modules.inv.service.InvInvoiceInfoService;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
@@ -37,37 +40,28 @@ public class InvInvoiceInfoController extends BaseController {
     @Autowired
     private InvInvoiceInfoService invInvoiceInfoService;
 
+    @Autowired
+    private InvInvoiceInfoInOutService invInvoiceInfoInOutService;
 
-    @ApiOperation(value = "保存")
-    @ApiResponses({
-            @ApiResponse(code = 500, message = "出现异常"),
-            @ApiResponse(code = 200, message = "请求成功")
-    })
-    @PostMapping(value = "/save")
-    public HttpResult save(@RequestBody InvInvoiceInfo invInvoiceInfo, HttpServletRequest request) {
-
-
-
-
-        invInvoiceInfo.setApprovalStatus(ApprovalStatusEnum.AS0.getCode());
-        if(StringUtils.isNotEmpty(invInvoiceInfo.getId())){
-//            //更新
-//            InvInvoiceInfo info = invInvoiceInfoService.getById(invInvoiceInfo.getId());
-//            if(info.getApprovalStatus().equals(ApprovalStatusEnum.AS1.getCode())){
-//                return HttpResult.error("审核通过的不允许修改");
-//            }
-
-            invInvoiceInfo.setUpdateBy(getUserId());
-            invInvoiceInfo.setUpdateTime(new Date());
 
-        }else{
-            //新增
-            invInvoiceInfo.setCreateBy(getUserId());
-            invInvoiceInfo.setCreateTime(new Date());
-        }
+    @ApiOperation(value = "保存(外部合同开票)")
+    @PostMapping(value = "/saveTypeOne")
+    public HttpResult saveTypeOne(@RequestBody InvInvoiceInfoDto dto) {
+        dto.getInvoiceInfo().setType(1);
+        return HttpResult.ok(invInvoiceInfoService.saveInvoice(dto));
 
 
-        return HttpResult.ok(invInvoiceInfoService.saveOrUpdate(invInvoiceInfo));
+    }
+    @ApiOperation(value = "保存(手续费开票)")
+    @PostMapping(value = "/saveTypeTwo")
+    public HttpResult saveTypeTwo(@RequestBody InvInvoiceInfoDto dto) {
+        dto.getInvoiceInfo().setType(2);
+        return HttpResult.ok(invInvoiceInfoService.saveInvoice(dto));
+    }
+    @ApiOperation(value = "保存")
+    @PostMapping(value = "/save")
+    public HttpResult save(@RequestBody InvInvoiceInfoDto dto) {
+        return HttpResult.ok(invInvoiceInfoService.saveInvoice(dto));
     }
 
     /**
@@ -160,4 +154,26 @@ public class InvInvoiceInfoController extends BaseController {
     }
 
 
+
+    @GetMapping(value = "/details/{id}")
+    @ApiOperation(value = "获取发票详情(包含进出帐)")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "String")
+    })
+    public HttpResult<InvInvoiceInfoDto> details(@PathVariable String id) {
+
+        InvInvoiceInfo invInfo = invInvoiceInfoService.getById(id);
+
+        LambdaQueryWrapper<InvInvoiceInfoInOut> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(InvInvoiceInfoInOut::getId,invInfo.getId());
+        List<InvInvoiceInfoInOut> inOutList = invInvoiceInfoInOutService.list(lqw);
+
+        InvInvoiceInfoDto iiiDto = new InvInvoiceInfoDto();
+        iiiDto.setInvoiceInfo(invInfo);
+        iiiDto.setInvoiceInfoInOutList(inOutList);
+
+        return HttpResult.ok(iiiDto);
+    }
+
+
 }

src/main/java/com/ydtech/modules/inv/dao/InvChannelsExternalBillsDetailsMapper.java

@@ -13,25 +13,28 @@ public interface InvChannelsExternalBillsDetailsMapper extends BaseMapper<InvCha
 
     //匹配sql
     String selectFrom = "select t1.id,t1.batch_num as batchNum" +
+            ",if(t2.id is null ,'数据未找到','数据不匹配') AS 'notMatchMsg'" +
             //交强险
             ",IFNULL(t1.mlifta,0) as mlifta1" +
             ",IFNULL(t2.mlifta,0) as mlifta2" +
+            ",if(t1.mlifta &lt;=&gt; t2.mlifta,true,false) as 'mliftaMatch'" +
             ",IFNULL(t1.mlifta_cost,0) as mliftaCost1" +
             ",IFNULL(t2.mlifta_cost,0) as mliftaCost2" +
-            ",if(t2.id is null ,'数据未找到','数据不匹配') AS 'notMatchMsg'" +
-            ",if(t1.mlifta &lt;=&gt; t2.mlifta,true,false) as 'mliftaMatch'" +
+            ",if(t1.mlifta_cost &lt;=&gt; t2.mlifta_cost,true,false) as 'mliftaCostMatch'" +
             //车船税
             ",IFNULL(t1.vavt,0) as vavt1" +
             ",IFNULL(t2.vavt,0) as vavt2" +
+            ",if(t1.vavt &lt;=&gt; t2.vavt,true,false) as 'vavtMatch'" +
             ",IFNULL(t1.vavt_cost,0) as vavtCost1" +
             ",IFNULL(t2.vavt_cost,0) as vavtCost2" +
-            ",if(t1.vavt &lt;=&gt; t2.vavt,true,false) as 'vavtMatch'" +
+            ",if(t1.vavt_cost &lt;=&gt; t2.vavt_cost,true,false) as 'vavtCostMatch'" +
             //商业险
             ",IFNULL(t1.cip,0) as cip1" +
             ",IFNULL(t2.cip,0) as cip2" +
+            ",if(t1.cip &lt;=&gt; t2.cip,true,false) as 'cipMatch'" +
             ",IFNULL(t1.cip_cost,0) as cipCost1" +
             ",IFNULL(t1.cip_cost,0) as cipCost2" +
-            ",if(t1.cip &lt;=&gt; t2.cip,true,false) as 'cipMatch'" +
+            ",if(t1.cip_cost &lt;=&gt; t2.cip_cost,true,false) as 'cipCostMatch'" +
 
             ",t1.plate_num as plateNum1" +
             ",t2.plate_num as plateNum2" +
@@ -63,10 +66,11 @@ public interface InvChannelsExternalBillsDetailsMapper extends BaseMapper<InvCha
             " and t.batchNum = #{page.batchNum} " +
             "</if> " +
             "<if test='page.isMatch !=null and page.isMatch!=\"\" and page.isMatch == 1  '>" +
-            " and t.mliftaMatch=1 and t.plateNumMatch=1 and t.vavtMatch=1 and t.cipMatch=1 and t.status &lt;=&gt; 0 " +
+            " and t.mliftaMatch=1 and t.plateNumMatch=1 and t.vavtMatch=1 and t.cipMatch=1 and t.status &lt;&gt; 0 " +
             "</if> " +
             "<if test='page.isMatch !=null and page.isMatch!=\"\" and page.isMatch == 0  '>" +
-            " and (t.mliftaMatch=0 or t.plateNumMatch=0 or t.vavtMatch=0 or t.cipMatch=0  and t.status &lt;=&gt; 0) " +
+            " and (t.mliftaMatch=0 or t.plateNumMatch=0 or t.vavtMatch=0 or t.cipMatch=0  and t.status &lt;&gt; 0) " +
+//            " and (t.mliftaMatch=0 or t.plateNumMatch=0 or t.vavtMatch=0 or t.cipMatch=0  and t.status &lt;=&gt; 0) " +
             "</if> ";
 
 

src/main/java/com/ydtech/modules/inv/dao/InvInvoiceInfoInOutMapper.java

@@ -0,0 +1,14 @@
+package com.ydtech.modules.inv.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.inv.model.InvInvoiceInfoInOut;
+
+/**
+ */
+public interface InvInvoiceInfoInOutMapper extends BaseMapper<InvInvoiceInfoInOut> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/inv/model/InvInvoiceInfo.java

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.modules.base.model.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,7 +22,7 @@ import lombok.Data;
  */
 @TableName(value = "inv_invoice_info")
 @Data
-public class InvInvoiceInfo implements Serializable {
+public class InvInvoiceInfo extends BaseEntity implements Serializable {
     /**
      * ID
      */
@@ -139,24 +140,6 @@ public class InvInvoiceInfo implements Serializable {
     @TableField(value = "invoice_type")
     private String invoiceType;
 
-    /**
-     * 进账日期
-     */
-    @Excel(name = "进账日期",exportFormat = "yyyy-MM-dd")
-//    @Excel(name = "进账日期",importFormat = "yyyy/MM/dd",exportFormat = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "进账日期")
-    @TableField(value = "income_date")
-    private Date incomeDate;
-
-    /**
-     * 进账金额
-     */
-    @Excel(name = "进账金额")
-    @ApiModelProperty(value = "进账金额")
-    @TableField(value = "income_money")
-    private BigDecimal incomeMoney;
-
     /**
      * 未进账金额
      */
@@ -165,22 +148,6 @@ public class InvInvoiceInfo implements Serializable {
     @TableField(value = "not_income_money")
     private BigDecimal notIncomeMoney;
 
-    /**
-     * 出账日期
-     */
-    @Excel(name = "出账日期",exportFormat = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "出账日期")
-    @TableField(value = "out_income_date")
-    private Date outIncomeDate;
-
-    /**
-     * 出账金额
-     */
-    @Excel(name = "出账金额")
-    @ApiModelProperty(value = "出账金额")
-    @TableField(value = "out_income_money")
-    private BigDecimal outIncomeMoney;
 
     /**
      * 利润点
@@ -221,31 +188,11 @@ public class InvInvoiceInfo implements Serializable {
     @TableField(value = "remark")
     private String remark;
 
-    /**
-     * 创建人
-     */
-    @TableField(value = "create_by")
-    private String createBy;
 
-    /**
-     * 创建时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "create_time")
-    private Date createTime;
+    @ApiModelProperty(value = "类型（1 外部合同开票、2手续费开票）")
+    @TableField(value = "type")
+    private int type;
 
-    /**
-     * 更新人
-     */
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "update_time")
-    private Date updateTime;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/ydtech/modules/inv/model/InvInvoiceInfoInOut.java

@@ -0,0 +1,69 @@
+package com.ydtech.modules.inv.model;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ydtech.modules.base.model.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 发票信息  进账出账
+ */
+@TableName(value = "inv_invoice_info_in_out")
+@Data
+public class InvInvoiceInfoInOut extends BaseEntity implements Serializable {
+    /**
+     * ID
+     */
+//    @TableId(value = "id")
+    private String id;
+
+    /**
+     * 进账日期
+     */
+    @Excel(name = "进账日期",exportFormat = "yyyy-MM-dd")
+//    @Excel(name = "进账日期",importFormat = "yyyy/MM/dd",exportFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "进账日期")
+    @TableField(value = "income_date")
+    private Date incomeDate;
+
+    /**
+     * 进账金额
+     */
+    @Excel(name = "进账金额")
+    @ApiModelProperty(value = "进账金额")
+    @TableField(value = "income_money")
+    private BigDecimal incomeMoney;
+
+    /**
+     * 出账日期
+     */
+    @Excel(name = "出账日期",exportFormat = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "出账日期")
+    @TableField(value = "out_income_date")
+    private Date outIncomeDate;
+
+    /**
+     * 出账金额
+     */
+    @Excel(name = "出账金额")
+    @ApiModelProperty(value = "出账金额")
+    @TableField(value = "out_income_money")
+    private BigDecimal outIncomeMoney;
+
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/ydtech/modules/inv/model/dto/InvInvoiceInfoDto.java

@@ -0,0 +1,20 @@
+package com.ydtech.modules.inv.model.dto;
+
+import com.ydtech.modules.inv.model.InvInvoiceInfo;
+import com.ydtech.modules.inv.model.InvInvoiceInfoInOut;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ */
+@Data
+public class InvInvoiceInfoDto{
+
+
+    private InvInvoiceInfo invoiceInfo;
+
+    private List<InvInvoiceInfoInOut> invoiceInfoInOutList;
+
+}

src/main/java/com/ydtech/modules/inv/service/InvInvoiceInfoInOutService.java

@@ -0,0 +1,12 @@
+package com.ydtech.modules.inv.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.inv.model.InvInvoiceInfoInOut;
+
+/**
+ */
+public interface InvInvoiceInfoInOutService extends IService<InvInvoiceInfoInOut> {
+
+
+
+}

src/main/java/com/ydtech/modules/inv/service/InvInvoiceInfoService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.constants.enums.dict.ApprovalStatusEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.inv.model.InvInvoiceInfo;
+import com.ydtech.modules.inv.model.dto.InvInvoiceInfoDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -24,4 +25,6 @@ public interface InvInvoiceInfoService extends IService<InvInvoiceInfo> {
 
     HttpResult exportData(List<String> ids, HttpServletRequest request, HttpServletResponse response);
 
+    boolean saveInvoice(InvInvoiceInfoDto dto);
+
 }

src/main/java/com/ydtech/modules/inv/service/impl/InvInvoiceInfoInOutServiceImpl.java

@@ -0,0 +1,21 @@
+package com.ydtech.modules.inv.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.inv.dao.InvInvoiceInfoInOutMapper;
+import com.ydtech.modules.inv.model.InvInvoiceInfoInOut;
+import com.ydtech.modules.inv.service.InvInvoiceInfoInOutService;
+import org.springframework.stereotype.Service;
+
+/**
+ */
+@Service
+public class InvInvoiceInfoInOutServiceImpl extends ServiceImpl<InvInvoiceInfoInOutMapper, InvInvoiceInfoInOut>
+        implements InvInvoiceInfoInOutService {
+
+
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/inv/service/impl/InvInvoiceInfoServiceImpl.java

@@ -13,7 +13,10 @@ import com.ydtech.modules.ins.utils.ExcelStyleUtil;
 import com.ydtech.modules.inv.dao.InvInvoiceInfoMapper;
 import com.ydtech.modules.inv.model.InvCompany;
 import com.ydtech.modules.inv.model.InvInvoiceInfo;
+import com.ydtech.modules.inv.model.InvInvoiceInfoInOut;
+import com.ydtech.modules.inv.model.dto.InvInvoiceInfoDto;
 import com.ydtech.modules.inv.service.InvCompanyService;
+import com.ydtech.modules.inv.service.InvInvoiceInfoInOutService;
 import com.ydtech.modules.inv.service.InvInvoiceInfoService;
 import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.excel.ExcelEasypoiUtils;
@@ -22,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -39,10 +43,12 @@ import java.util.stream.Collectors;
 public class InvInvoiceInfoServiceImpl extends ServiceImpl<InvInvoiceInfoMapper, InvInvoiceInfo>
         implements InvInvoiceInfoService {
 
-    @Autowired
+    @Resource
     private InvCompanyService invCompanyService;
-    @Autowired
+    @Resource
     private SysDictService sysDictService;
+    @Resource
+    private InvInvoiceInfoInOutService invInvoiceInfoInOutService;
 
     @Override
     public boolean approval(ApprovalStatusEnum approvalStatusEnum, List<String> ids) {
@@ -146,6 +152,20 @@ public class InvInvoiceInfoServiceImpl extends ServiceImpl<InvInvoiceInfoMapper,
         return HttpResult.ok("导出成功");
     }
 
+    @Override
+    public boolean saveInvoice(InvInvoiceInfoDto dto) {
+        InvInvoiceInfo invInvoiceInfo = dto.getInvoiceInfo();
+        invInvoiceInfo.setApprovalStatus(ApprovalStatusEnum.AS1.getCode());
+        if(StringUtils.isNotEmpty(invInvoiceInfo.getId())){
+            List<InvInvoiceInfoInOut> invoiceInfoInOutList = dto.getInvoiceInfoInOutList();
+            if(null !=invoiceInfoInOutList && invoiceInfoInOutList.size()>0){
+                invInvoiceInfoInOutService.removeById(invInvoiceInfo.getId());
+                invInvoiceInfoInOutService.saveBatch(invoiceInfoInOutList);
+            }
+        }
+        return saveOrUpdate(invInvoiceInfo);
+    }
+
 
 }
 

src/main/java/com/ydtech/modules/nai/controller/ChinaCoalInterface.java

@@ -66,8 +66,6 @@ public class ChinaCoalInterface {
     @Autowired
     EsmRetailService esmRetailService;
     @Autowired
-    EsmUserInternalService esmUserInternalService;
-    @Autowired
     InsOrderTaskService insOrderTaskService;
     @Autowired
     InsTaskHistoryService insTaskHistoryService;
@@ -1377,38 +1375,39 @@ public class ChinaCoalInterface {
      */
     public double countRetail(String deptid, String userid) {
         double retailRate = 0;
-
-        //1、根据机构匹配分销规则，获取分销比例
-        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
-        //2、根据userid查询三级推荐人
-        List<SysUser> users = esmUserInternalService.getSuperior(userid);
-
-        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
-            EsmRetail retail = list.get(0);
-            List<Double> rateList = new ArrayList<Double>();
-            rateList.add(retail.getDisrate1());
-            rateList.add(retail.getDisrate2());
-            rateList.add(retail.getDisrate3());
-
-            if ("1".equals(retail.getRetailtype())) {//一级分销
-                retailRate += rateList.get(0);
-            } else if ("2".equals(retail.getRetailtype())) {//二级分销
-                int num = users.size() > 2 ? 2 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            } else {//三级分销
-                int num = users.size() > 2 ? 3 : users.size();
-                for (int i = 0; i < num; i++) {
-                    retailRate += rateList.get(i);
-                }
-
-            }
-
-        }
-
         return retailRate;
+
+//        //1、根据机构匹配分销规则，获取分销比例
+//        List<EsmRetail> list = esmRetailService.selectList(" where deptid = ? and status=?", new Object[]{deptid, "1"});
+//        //2、根据userid查询三级推荐人
+//        List<SysUser> users = esmUserInternalService.getSuperior(userid);
+//
+//        if (list != null && list.size() > 0 && users.size() > 0 && !"0".equals(list.get(0).getRetailtype())) {
+//            EsmRetail retail = list.get(0);
+//            List<Double> rateList = new ArrayList<Double>();
+//            rateList.add(retail.getDisrate1());
+//            rateList.add(retail.getDisrate2());
+//            rateList.add(retail.getDisrate3());
+//
+//            if ("1".equals(retail.getRetailtype())) {//一级分销
+//                retailRate += rateList.get(0);
+//            } else if ("2".equals(retail.getRetailtype())) {//二级分销
+//                int num = users.size() > 2 ? 2 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            } else {//三级分销
+//                int num = users.size() > 2 ? 3 : users.size();
+//                for (int i = 0; i < num; i++) {
+//                    retailRate += rateList.get(i);
+//                }
+//
+//            }
+//
+//        }
+//
+//        return retailRate;
     }
 
     public String getUserName() {

src/main/java/com/ydtech/utils/excel/ExcelEasypoiUtils.java

@@ -8,6 +8,7 @@ import com.ydtech.exception.SystemException;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -33,26 +34,51 @@ public class ExcelEasypoiUtils {
      */
     public static void exportExcel(List<?> list, Class<?> pojoClass, String fileName, HttpServletResponse response) throws IOException {
         ExportParams ep = new ExportParams();
-        Workbook sheets = ExcelExportUtil.exportExcel(ep, pojoClass,list);
-
+        Workbook workbook = ExcelExportUtil.exportExcel(ep, pojoClass,list);
+
+//        try {
+//            //3.返回表格
+//            //设置表格文件名字
+////            String fileName = batchNum + "-保司数据导出";
+//            fileName = URLEncoder.encode(fileName,"UTF8");
+//
+//            //设置返回数据类型
+////            response.setContentType("application/vnd.ms-excel;charset=utf-8");
+//            response.setContentType("multipart/form-data");
+//            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xls");
+//
+//            //将表格输出
+//            workbook.write(response.getOutputStream());
+//
+//        } catch (UnsupportedEncodingException e) {
+//            throw new RuntimeException(e);
+//        } catch (IOException e) {
+//            throw new RuntimeException(e);
+//        }
+
+//        fileName = URLEncoder.encode(fileName,"GBK");
+//        fileName = URLEncoder.encode(fileName,"UTF8");
+
+        fileName = URLEncoder.encode(fileName,"UTF8");
+
+        response.reset();
+//        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.setContentType("application/x-msdownload");
+        response.addHeader("Access-Control-Allow-Origin", "*");
+        response.addHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE");
+        response.addHeader("Access-Control-Allow-Headers", "Content-Type");
+        response.setHeader("Content-Disposition", "attachment; filename=" + fileName +".xlsx");
+//        response.setHeader("Content-Disposition", "attachment; filename=" + java.net.URLEncoder.encode(fileName+".xlsx", "UTF-8"));
+        ServletOutputStream outStream = null;
         try {
-            //3.返回表格
-            //设置表格文件名字
-//            String fileName = batchNum + "-保司数据导出";
-            fileName = URLEncoder.encode(fileName,"UTF8");
-
-            //设置返回数据类型
-            response.setContentType("application/vnd.ms-excel;charset=utf-8");
-            response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xls");
-
-            //将表格输出
-            sheets.write(response.getOutputStream());
-
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+            outStream = response.getOutputStream();
+            workbook.write(outStream);
+        } finally {
+            outStream.close();
         }
+
+
+
     }
 
 

src/main/java/com/ydtech/utils/excel/ExcelUtils.java

@@ -542,12 +542,11 @@ public class ExcelUtils {
                 info.setTaxAmounts(new BigDecimal(getCellValue(row.getCell(9))));
                 info.setInvoiceAmount(new BigDecimal(getCellValue(row.getCell(10))));
                 info.setInvoiceType(getCellValue(row.getCell(11)));
-                info.setIncomeDate(DateFormat.getDateInstance().parse(getCellValue(row.getCell(12))));
-                info.setIncomeMoney(new BigDecimal(getCellValue(row.getCell(13))));
                 info.setNotIncomeMoney(new BigDecimal(getCellValue(row.getCell(14))));
-                info.setOutIncomeDate(StringUtils.isNullOrEmpty(getCellValue(row.getCell(15)))?null:new Date(getCellValue(row.getCell(15))));
-//                info.setOutIncomeDate(DateFormat.getDateInstance().parse(getCellValue(row.getCell(15))));
-                info.setOutIncomeMoney(new BigDecimal(getCellValue(row.getCell(16))));
+//                info.setIncomeDate(DateFormat.getDateInstance().parse(getCellValue(row.getCell(12))));
+//                info.setIncomeMoney(new BigDecimal(getCellValue(row.getCell(13))));
+//                info.setOutIncomeDate(StringUtils.isNullOrEmpty(getCellValue(row.getCell(15)))?null:new Date(getCellValue(row.getCell(15))));
+//                info.setOutIncomeMoney(new BigDecimal(getCellValue(row.getCell(16))));
                 info.setProfitPoint(getCellValue(row.getCell(17)));
                 info.setGrossProfit(getCellValue(row.getCell(18)));
                 info.setProcedureFee(getCellValue(row.getCell(19)));

src/main/java/com/ydtech/utils/excel/ExcelUtils2.java

@@ -245,7 +245,7 @@ public class ExcelUtils2 {
         List<InvInvoiceInfo> objList = ExcelImportUtil.importExcel(file, InvInvoiceInfo.class, importParams);
 
         for (InvInvoiceInfo vo : objList) {
-            System.out.println(vo.getInvoiceDate()+ "---" + vo.getIncomeMoney());
+//            System.out.println(vo.getInvoiceDate()+ "---" + vo.getIncomeMoney());
         }
     }
 }