费用清单查询

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -190,6 +190,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         deptFee.setAgreeid(plyDto.getAgreementId());
         deptFee.setAuditstatus("1");
         deptFee.setSettlestatus("0");
+        deptFee.setInscompany(plyDto.getCompanyId());
         if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
             deptFee.setPolicyno(plyDto.getJqpolicyno());
             deptFee.setRiskcode("交强");
@@ -262,6 +263,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 InsCommission commission = new InsCommission();
                 commission.setOrderno(order.getOrderno());
                 commission.setQuoteno(insFeeOrder.getInsOrderNo());
+                commission.setDeptid(order.getDeptid());
+                commission.setDeptname(order.getDeptname());
+                commission.setInscompany(plyDto.getCompanyId());
+                commission.setAgreeid(plyDto.getAgreementId());
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
                 commission.setLevel("3");
@@ -293,6 +298,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 InsCommission commission = new InsCommission();
                 commission.setOrderno(order.getOrderno());
                 commission.setQuoteno(insFeeOrder.getInsOrderNo());
+                commission.setDeptid(order.getDeptid());
+                commission.setDeptname(order.getDeptname());
+                commission.setInscompany(plyDto.getCompanyId());
+                commission.setAgreeid(plyDto.getAgreementId());
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
 //                commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue()* 0.01);
@@ -325,6 +334,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 InsCommission commission = new InsCommission();
                 commission.setOrderno(order.getOrderno());
                 commission.setQuoteno(insFeeOrder.getInsOrderNo());
+                commission.setDeptid(order.getDeptid());
+                commission.setDeptname(order.getDeptname());
+                commission.setInscompany(plyDto.getCompanyId());
+                commission.setAgreeid(plyDto.getAgreementId());
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
 //                commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue()* 0.01);

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

@@ -263,6 +263,7 @@ public class InsFeeDetailController extends BaseController {
         String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
         String frameNo = pageRequest.getColumnFilterValue(pageRequest, "frameNo"); // 车架号
         String licenseNo = pageRequest.getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
+        String policyno = pageRequest.getColumnFilterValue(pageRequest, "policyno"); // 保单号
         String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
         String inscompany = pageRequest.getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
         String settletype = pageRequest.getColumnFilterValue(pageRequest, "settletype"); // 结算类型  A保险公司 B业务员
@@ -305,6 +306,10 @@ public class InsFeeDetailController extends BaseController {
             whereStr.append(" and orderno=?");
             array.add(orderno);
         }
+        if (!StringUtils.isEmpty(policyno)) {
+            whereStr.append(" and policyno=?");
+            array.add(policyno);
+        }
         if (!StringUtils.isEmpty(inscompany)) {
             whereStr.append(" and inscompany=?");
             array.add(inscompany);
@@ -314,8 +319,8 @@ public class InsFeeDetailController extends BaseController {
             array.add(userid);
         }
         if (!StringUtils.isEmpty(username)) {
-            whereStr.append(" and username=?");
-            array.add(username);
+            whereStr.append(" and username like ?");
+            array.add("%"+username+ "%");
         }
         if (!StringUtils.isEmpty(deptid)) {
             whereStr.append(" and deptid like ?");
@@ -326,11 +331,11 @@ public class InsFeeDetailController extends BaseController {
             array.add(agreeid);
         }
         if (!StringUtils.isEmpty(riskCode)) {
-            whereStr.append(" and producname=?");
+            whereStr.append(" and riskCode=?");
             array.add(riskCode);
         }
         if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
-            whereStr.append(" and exists(select 1 from ins_order a where a.orderno=t.orderno and (DATE_FORMAT(a.audittime, '%Y-%m-%d') between date ? and date ?))");
+            whereStr.append(" and exists(select 1 from ins_ply_income a where a.orderno=t.orderno and (DATE_FORMAT(a.pay_date, '%Y-%m-%d') between date ? and date ?))");
             array.add(startdate);
             array.add(enddate);
         }
@@ -400,21 +405,60 @@ public class InsFeeDetailController extends BaseController {
         int pageSize = pageRequest.getPageSize();
 
         String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
+        String policyno = pageRequest.getColumnFilterValue(pageRequest, "policyno"); // 保单号
+        String riskCode = pageRequest.getColumnFilterValue(pageRequest, "riskCode"); // 保单号
         String userid = pageRequest.getColumnFilterValue(pageRequest, "userid");
+        String username = pageRequest.getColumnFilterValue(pageRequest, "username"); // 业务员
         String auditstatus = pageRequest.getColumnFilterValue(pageRequest, "auditstatus");
+        String licenseNo = pageRequest.getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid"); // 机构
+        String inscompany = pageRequest.getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
 
+
         if (!StringUtils.isEmpty(orderno)) {
             whereStr.append(" and orderno=?");
             array.add(orderno);
         }
-
+        if (!StringUtils.isEmpty(policyno)) {
+            whereStr.append(" and policyno=?");
+            array.add(policyno);
+        }
+        if (!StringUtils.isEmpty(licenseNo)) {
+            whereStr.append(" and licenseno=?");
+            array.add(licenseNo);
+        }
+        if (!StringUtils.isEmpty(inscompany)) {
+            whereStr.append(" and inscompany=?");
+            array.add(inscompany);
+        }
         if (!StringUtils.isEmpty(userid)) {
             whereStr.append(" and refereescode=?");
             array.add(userid);
         }
+        if (!StringUtils.isEmpty(username)) {
+            whereStr.append(" and refereesname like ?");
+            array.add("%"+username+ "%");
+        }
+        if (!StringUtils.isEmpty(deptid)) {
+            whereStr.append(" and deptid like ?");
+            array.add(deptid + "%");
+        }
+
+        if (!StringUtils.isEmpty(riskCode)) {
+            whereStr.append(" and riskCode=?");
+            array.add(riskCode);
+        }
+        if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
+            whereStr.append(" and exists(select 1 from ins_ply_income a where a.orderno=t.orderno and (DATE_FORMAT(a.pay_date, '%Y-%m-%d') between date ? and date ?))");
+            array.add(startdate);
+            array.add(enddate);
+        }
+
 
         if (!StringUtils.isEmpty(auditstatus)) {
             whereStr.append(" and auditstatus=?");
@@ -439,6 +483,8 @@ public class InsFeeDetailController extends BaseController {
         int pageSize = pageRequest.getPageSize();
 
         String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
+        String policyno = pageRequest.getColumnFilterValue(pageRequest, "policyno"); // 订单号
+
         String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid");
         String auditstatus = pageRequest.getColumnFilterValue(pageRequest, "auditstatus");
         String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode");
@@ -465,7 +511,10 @@ public class InsFeeDetailController extends BaseController {
             whereStr.append(" and orderno=?");
             array.add(orderno);
         }
-
+        if (!StringUtils.isEmpty(policyno)) {
+            whereStr.append(" and policyno=?");
+            array.add(policyno);
+        }
         if (!StringUtils.isEmpty(deptid)) {
             whereStr.append(" and comcode=?");
             array.add(deptid);

src/main/java/com/ydtech/modules/ins/dao/impl/InsCommissionDaoImpl.java

@@ -30,6 +30,14 @@ public class InsCommissionDaoImpl implements InsCommissionDao {
             InsCommission model = new InsCommission();
 
             model.setOrderno(resultSet.getString("orderno"));
+            model.setPolicyno(resultSet.getString("policyno"));
+            model.setLicenseno(resultSet.getString("licenseno"));
+            model.setRiskcode(resultSet.getString("riskcode"));
+            model.setDeptid(resultSet.getString("deptid"));
+            model.setDeptname(resultSet.getString("deptname"));
+            model.setInscompany(resultSet.getString("inscompany"));
+            model.setAgreeid(resultSet.getString("agreeid"));
+
             model.setQuoteno(resultSet.getString("quoteno"));
             model.setRefereescode(resultSet.getString("refereescode"));
             model.setRefereesname(resultSet.getString("refereesname"));
@@ -102,7 +110,8 @@ public class InsCommissionDaoImpl implements InsCommissionDao {
     public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
 
         Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.quoteno,t.refereescode,t.refereesname,t.commissionrate,t.commissionamount,t.level,t.auditstatus,t.settlestatus,t.insuredtime from ins_commission t  " + whereCase);
+        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.policyno,t.deptid,t.deptname,t.riskcode,t.licenseno,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.quoteno,t.refereescode,t.refereesname,t.commissionrate,t.commissionamount,t.level,t.auditstatus,t.settlestatus,t.insuredtime " +
+                "from ins_commission t  " + whereCase);
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         List<InsCommission> recordList = jdbcTemplate.query(sql, paramValues, new InsCommissionRowMapper());
@@ -118,12 +127,12 @@ public class InsCommissionDaoImpl implements InsCommissionDao {
     @Override
     public Integer insert(InsCommission model) {
 
-        String sql = "insert into ins_commission (orderno,policyno,licenseno,riskcode,quoteno,refereescode,refereesname,commissionrate,commissionamount,level,auditstatus,settlestatus,insuredtime) " +
-                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+        String sql = "insert into ins_commission (orderno,policyno,licenseno,riskcode,deptid,deptname,inscompany,agreeid,quoteno,refereescode,refereesname,commissionrate,commissionamount,level,auditstatus,settlestatus,insuredtime) " +
+                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getRefereescode(), model.getRefereesname(), model.getCommissionrate(), model.getCommissionamount(), model.getLevel(), model.getAuditstatus(), model.getSettlestatus(), model.getInsuredtime()};
+        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getLicenseno(),model.getRiskcode(),model.getDeptid(),model.getDeptname(),model.getInscompany(),model.getAgreeid(), model.getQuoteno(), model.getRefereescode(), model.getRefereesname(), model.getCommissionrate(), model.getCommissionamount(), model.getLevel(), model.getAuditstatus(), model.getSettlestatus(), model.getInsuredtime()};
 
         int out = jdbcTemplate.update(sql, params);
 

src/main/java/com/ydtech/modules/ins/dao/impl/InsCompanyFeeDaoImpl.java

@@ -33,6 +33,8 @@ public class InsCompanyFeeDaoImpl implements InsCompanyFeeDao {
             InsCompanyFee model = new InsCompanyFee();
 
             model.setOrderno(resultSet.getString("orderno"));
+            model.setPolicyno(resultSet.getString("policyno"));
+            model.setRiskcode(resultSet.getString("riskcode"));
             model.setFeerate(resultSet.getDouble("feerate"));
             model.setDisrate(resultSet.getDouble("disrate"));
             model.setFeeamount(resultSet.getDouble("feeamount"));
@@ -139,7 +141,7 @@ public class InsCompanyFeeDaoImpl implements InsCompanyFeeDao {
 
 
         Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.settleno,t.feerate,t.disrate,t.feeamount,t.disamount,t.jqpremium,t.sypremium,t.frameNo,t.licenseNo,t.inscompany,t.agreeid,t.agreementcode,t.agreeprodid,t.producname,t.agreetype,t.settlestatus,t.settletime, " +
+        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.policyno,t.riskcode,t.settleno,t.feerate,t.disrate,t.feeamount,t.disamount,t.jqpremium,t.sypremium,t.frameNo,t.licenseno,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.agreementcode,t.agreeprodid,t.riskcode producname,t.agreetype,t.settlestatus,t.settletime, " +
                 "t.settletype,t.userid,t.username,t.deptid,t.deptname,t.createtime from ins_companyfee t " + whereCase);
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);

src/main/java/com/ydtech/modules/ins/dao/impl/InsDeptFeeDaoImpl.java

@@ -30,6 +30,7 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
             InsDeptFee model = new InsDeptFee();
 
             model.setOrderno(resultSet.getString("orderno"));
+            model.setPolicyno(resultSet.getString("policyno"));
             model.setQuoteno(resultSet.getString("quoteno"));
             model.setAgreeid(resultSet.getString("agreeid"));
             model.setAgreeprodid(resultSet.getString("agreeprodid"));
@@ -42,7 +43,8 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
             model.setAuditstatus(resultSet.getString("auditstatus"));
             model.setSettlestatus(resultSet.getString("settlestatus"));
             model.setLicenseno(resultSet.getString("licenseno"));
-
+            model.setRiskcode(resultSet.getString("riskcode"));
+            model.setInscompany(resultSet.getString("inscompany"));
             return model;
         }
     }
@@ -139,7 +141,7 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
     public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
 
         Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.quoteno,t.agreeid,t.agreeprodid,t.comlevel,t.comcode,t.keeprate,t.addrate,t.keepamount,t.addamount,t.auditstatus,t.settlestatus,t2.licenseno from ins_deptfee t left join ins_order t2 on t.orderno=t2.orderno " + whereCase);
+        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.quoteno,t.policyno,t.riskcode,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.agreeprodid,t.comlevel,t.comcode,t.keeprate,t.addrate,t.keepamount,t.addamount,t.auditstatus,t.settlestatus,t.licenseno from ins_deptfee t  " + whereCase);
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         List<InsDeptFee> recordList = jdbcTemplate.query(sql, paramValues, new InsDeptFeeRowMapper());
@@ -155,12 +157,12 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
     @Override
     public Integer insert(InsDeptFee model) {
 
-        String sql = "insert into ins_deptfee (orderno,policyno,licenseno,riskcode,quoteno,agreeid,agreeprodid,comlevel,comcode,keeprate,addrate,keepamount,addamount,auditstatus,settlestatus) " +
-                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+        String sql = "insert into ins_deptfee (orderno,policyno,inscompany,licenseno,riskcode,quoteno,agreeid,agreeprodid,comlevel,comcode,keeprate,addrate,keepamount,addamount,auditstatus,settlestatus) " +
+                "values ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 
-        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getKeeprate(), model.getAddrate(), model.getKeepamount(), model.getAddamount(), model.getAuditstatus(), model.getSettlestatus()};
+        Object[] params = new Object[]{model.getOrderno(),model.getPolicyno(),model.getInscompany(),model.getLicenseno(),model.getRiskcode(), model.getQuoteno(), model.getAgreeid(), model.getAgreeprodid(), model.getComlevel(), model.getComcode(), model.getKeeprate(), model.getAddrate(), model.getKeepamount(), model.getAddamount(), model.getAuditstatus(), model.getSettlestatus()};
 
         int out = jdbcTemplate.update(sql, params);
 

src/main/java/com/ydtech/modules/ins/model/InsCommission.java

@@ -23,5 +23,9 @@ public class InsCommission {
     private String licenseno;
     private String policyno;
     private String riskcode;
+    private String deptid;
+    private String deptname;
+    private String inscompany;
+    private String agreeid;
 
 }

src/main/java/com/ydtech/modules/ins/model/InsDeptFee.java

@@ -25,5 +25,6 @@ public class InsDeptFee {
     private String licenseno;
     private String policyno;
     private String riskcode;
+    private String inscompany;
 
 }