yangyang %!s(int64=3) %!d(string=hai) anos
pai
achega
c3a86afb2d

+ 8 - 2
eladmin-system/src/main/java/me/zhengjie/application/admin/controller/AdminOrderController.java

@@ -229,8 +229,14 @@ public class AdminOrderController {
 	@ApiOperation("导出任务数据")
 	@PostMapping(value = "/download")
 	@PreAuthorize("@el.check('timing:list')")
-	public void exportQuartzJob(HttpServletResponse response,@RequestBody NotaryOrderQueryReq criteria) throws IOException {
-		adminOrderService.download(criteria, response);
+	public AppBaseResponse exportQuartzJob(HttpServletResponse response,@RequestBody NotaryOrderQueryReq criteria) throws IOException {
+		return adminOrderService.download(criteria, response);
+	}
+
+	@PreAuthorize("@el.check('timing:list')")
+	@PostMapping("/uploadIssuedTime")
+	public AppBaseResponse uploadIssuedTime(UploadIssuedTimeReq file) {
+		return adminOrderService.uploadIssuedTime(file);
 	}
 
 }

+ 15 - 0
eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/UploadIssuedTimeReq.java

@@ -0,0 +1,15 @@
+package me.zhengjie.application.admin.controller.vo;
+
+
+import lombok.Data;
+import me.zhengjie.base.BaseRequest;
+
+@Data
+public class UploadIssuedTimeReq extends BaseRequest {
+
+    private String consultNo;
+
+    private String issuedTime;
+
+
+}

+ 3 - 1
eladmin-system/src/main/java/me/zhengjie/application/admin/service/AdminOrderService.java

@@ -67,7 +67,9 @@ public interface AdminOrderService {
 	
 	public void updateStatus(NotaryOrderQueryReq req);
 
-    void download(NotaryOrderQueryReq queryReq, HttpServletResponse response) throws IOException;
+    AppBaseResponse download(NotaryOrderQueryReq queryReq, HttpServletResponse response) throws IOException;
+
+    AppBaseResponse uploadIssuedTime(UploadIssuedTimeReq queryReq);
 //
 //    /**
 //     * 查询全部

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 738 - 738
eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java


+ 171 - 1
eladmin-system/src/main/java/me/zhengjie/dao/mybatis/ContractOrderRepository.java

@@ -5,16 +5,19 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import me.zhengjie.application.admin.controller.vo.NotaryOrderQueryReq;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.dao.mybatis.mapper.*;
 import me.zhengjie.domain.order.OrderConstant;
 import me.zhengjie.utils.StringUtils;
+import org.apache.http.util.TextUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -87,6 +90,7 @@ public class ContractOrderRepository {
 
     /**
      * 根据业务编号统计借款订单数量
+     *
      * @param businessNo
      * @return
      */
@@ -98,6 +102,7 @@ public class ContractOrderRepository {
 
     /**
      * 根据业务编号统计抵押订单数量
+     *
      * @param businessNo
      * @return
      */
@@ -109,6 +114,7 @@ public class ContractOrderRepository {
 
     /**
      * 根据业务编号统计担保订单数量
+     *
      * @param businessNo
      * @return
      */
@@ -123,7 +129,7 @@ public class ContractOrderRepository {
      *
      * @return
      */
-    public List<ContractOrderEntity> canBeAutoSignedOrder(){
+    public List<ContractOrderEntity> canBeAutoSignedOrder() {
         QueryWrapper<ContractOrderEntity> orderQw = new QueryWrapper<>();
         orderQw.eq("status", OrderConstant.ORDER_STATUS_NOTARIZED);
         orderQw.eq("auto_generate", OrderConstant.NOTARIZATION_GENERATE_AUTO);
@@ -132,6 +138,7 @@ public class ContractOrderRepository {
 
     /**
      * 根据主订单号获取主订单
+     *
      * @param businessNo
      * @return
      */
@@ -184,6 +191,167 @@ public class ContractOrderRepository {
         });
     }
 
+    public Integer orderCount(NotaryOrderQueryReq req){
+        List<Object> mList = new ArrayList<>();
+        String sql = "select count(1) num " +
+                "from contract_order o,order_file f  where o.status=3 and " +
+                "o.business_no=f.business_no and f.code=10 ";
+
+        if (!TextUtils.isEmpty(req.getStartDate())) {
+            sql += "and o.issued_time>= ? ";
+            mList.add(req.getStartDate());
+        }
+        if (!TextUtils.isEmpty(req.getEndDate())) {
+            sql += "and o.issued_time <=? ";
+            mList.add(req.getEndDate());
+        }
+        if (!TextUtils.isEmpty(req.getIdCard())) {
+            sql += "and o.id_card= ? ";
+            mList.add(req.getIdCard());
+        }
+        if (!TextUtils.isEmpty(req.getName())) {
+            sql += "and o.name =? ";
+            mList.add(req.getName());
+        }
+        if (!TextUtils.isEmpty(req.getContractNo())) {
+            sql += "and o.contract_no=? ";
+            mList.add(req.getContractNo());
+        }
+        if (!TextUtils.isEmpty(req.getNotaryUserName())) {
+            sql += "and o.notary_user_name =? ";
+            mList.add(req.getNotaryUserName());
+        }
+        if (!TextUtils.isEmpty(req.getConsultNo())) {
+            sql += "and o.consult_no= ? ";
+            mList.add(req.getConsultNo());
+        }
+        if (!TextUtils.isEmpty(req.getBankId())) {
+            sql += "and o.bank_id =? ";
+            mList.add(req.getBankId());
+        }
+        if (!TextUtils.isEmpty(req.getCustomerName())) {
+            sql += "and o.customer_name=? ";
+            mList.add(req.getCustomerName());
+        }
+        if (!TextUtils.isEmpty(req.getProdId())) {
+            sql += "and o.prod_id =? ";
+            mList.add(req.getProdId());
+        }
+        sql += "ORDER BY o.issued_time desc";
+        Object[] arr = mList.toArray();
+        List<Map<String, String>> query = jdbcTemplate.query(sql, arr, new RowMapper<Map<String, String>>() {
+            @Override
+            public Map<String, String> mapRow(ResultSet resultSet, int i) throws SQLException {
+                Map<String, String> map = new HashMap<>();
+                map.put("num", resultSet.getString("num"));
+                return map;
+            }
+        });
+        return Integer.valueOf(query.get(0).get("num"));
+    }
+
+    /**
+     * 统计指定主订单下不同状态子订单数量
+     *
+     * @param
+     * @return
+     */
+    public List<Map<String, Object>> downloadOrder(NotaryOrderQueryReq req) {
+
+        List<Object> mList = new ArrayList<>();
+
+        String sql = "select o.consult_no ,f.doc_no ," +
+                " case o.prod_id  " +
+                "  WHEN '100010' then '个人购车' " +
+                "  WHEN '100020' then '邮享贷' " +
+                "  WHEN '200010' then '小额贷款'  " +
+                "  WHEN '200020' then '极速贷'  " +
+                "  WHEN '200020' then '极速贷'  " +
+                "  WHEN '300010' then '产业链经营贷'   " +
+                " end prod_id, " +
+                " case o.contract_type_id" +
+                "   WHEN 'ZH04035' then '个人购车借款及担保合同' " +
+                "   WHEN 'ZH04021' then '邮享贷-个人额度借款合同' " +
+                "   WHEN 'ZH02001' then '小额贷款额度借款合同' " +
+                "   WHEN 'ZH02060' then '小额贷款最高额抵押合同' " +
+                "   WHEN 'ZH02005' then '小额贷款最高额保证合同' " +
+                "   WHEN 'ZH02007' then '最高额综合授信合同' " +
+                "   WHEN 'ZH02018' then '极速贷-小额贷款额度借款合同' " +
+                "   WHEN 'ZH02033' then '产业链借款合同' " +
+                "   end contract_type_id," +
+                "   o.contract_no , o.name , o.phone ,o.id_card ," +
+                "  o.contract_money ,o.notary_user_name ,o.customer_name ," +
+                "  o.bank_name  ,o.joint_id_card  ,o.joint_name ," +
+                "  DATE_FORMAT(o.issued_time,'%Y-%m-%d %H:%i:%S') 'issued_time' " +
+                "from contract_order o,order_file f  where o.status=3 and " +
+                "o.business_no=f.business_no and f.code=10 ";
+        if (!TextUtils.isEmpty(req.getStartDate())) {
+            sql += "and o.issued_time>= ? ";
+            mList.add(req.getStartDate());
+        }
+        if (!TextUtils.isEmpty(req.getEndDate())) {
+            sql += "and o.issued_time <=?";
+            mList.add(req.getEndDate());
+        }
+        if (!TextUtils.isEmpty(req.getIdCard())) {
+            sql += "and o.id_card= ? ";
+            mList.add(req.getIdCard());
+        }
+        if (!TextUtils.isEmpty(req.getName())) {
+            sql += "and o.name =?";
+            mList.add(req.getName());
+        }
+        if (!TextUtils.isEmpty(req.getContractNo())) {
+            sql += "and o.contract_no= ? ";
+            mList.add(req.getContractNo());
+        }
+        if (!TextUtils.isEmpty(req.getNotaryUserName())) {
+            sql += "and o.notary_user_name =?";
+            mList.add(req.getNotaryUserName());
+        }
+        if (!TextUtils.isEmpty(req.getConsultNo())) {
+            sql += "and o.consult_no= ? ";
+            mList.add(req.getConsultNo());
+        }
+        if (!TextUtils.isEmpty(req.getBankId())) {
+            sql += "and o.bank_id =?";
+            mList.add(req.getBankId());
+        }
+        if (!TextUtils.isEmpty(req.getCustomerName())) {
+            sql += "and o.customer_name= ? ";
+            mList.add(req.getCustomerName());
+        }
+        if (!TextUtils.isEmpty(req.getProdId())) {
+            sql += "and o.prod_id =?";
+            mList.add(req.getProdId());
+        }
+        sql += "ORDER BY o.issued_time desc";
+        Object[] arr = mList.toArray();
+        return jdbcTemplate.query(sql, arr, new RowMapper<Map<String, Object>>() {
+            @Override
+            public Map<String, Object> mapRow(ResultSet rs, int rowNum) throws SQLException {
+                Map<String, Object> map = new HashMap<>();
+                map.put("受理咨询号", rs.getString("consult_no"));
+                map.put("公证书编号", rs.getString("doc_no"));
+                map.put("产品类型", rs.getString("prod_id"));
+                map.put("合同名称", rs.getString("contract_type_id"));
+                map.put("合同编号", rs.getString("contract_no"));
+                map.put("当事人", rs.getString("name"));
+                map.put("当事人手机号", rs.getString("phone"));
+                map.put("当事人证件号", rs.getString("id_card"));
+                map.put("合同金额", rs.getString("contract_money"));
+                map.put("公证员", rs.getString("notary_user_name"));
+                map.put("客户经理", rs.getString("customer_name"));
+                map.put("所属银行", rs.getString("bank_name"));
+                map.put("共同责任人身份证号码", rs.getString("joint_id_card"));
+                map.put("共同责任人姓名", rs.getString("joint_name"));
+                map.put("签发时间", rs.getString("issued_time"));
+                return map;
+            }
+        });
+    }
+
+
     /**
      * 根据主订单号获取子订单列表
      *
@@ -209,6 +377,7 @@ public class ContractOrderRepository {
 
     /**
      * 修改指定ID订单信息
+     *
      * @param order
      */
     public void updateWithId(ContractOrderEntity order) {
@@ -272,6 +441,7 @@ public class ContractOrderRepository {
 
     /**
      * 插入抵押物信息
+     *
      * @param entity
      */
     public void insertCollateral(CollateralInfoEntity entity) {

+ 41 - 0
eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/DownloadEntity.java

@@ -0,0 +1,41 @@
+package me.zhengjie.dao.mybatis.entity;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DownloadEntity {
+
+    private String businessNo;
+
+    private String prodId;
+
+    private String name;
+
+    private String idCard;
+
+    private String jointIdCard;
+
+    private String jointName;
+
+    private String phone;
+
+    private String bankName;
+
+    private String contractMoney;
+
+    private String contractNo;
+
+    private Integer contractType;
+
+    private String consultNo;
+
+    private String customerName;
+
+    private String notaryUserName;
+
+
+    private String docNo;
+
+}