询价发行

src/main/java/com/sztzjy/fund_investment/controller/InquiryIssuanceController.java

@@ -4,17 +4,17 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.sztzjy.fund_investment.annotation.AnonymousAccess;
-import com.sztzjy.fund_investment.entity.AllotmentObject;
-import com.sztzjy.fund_investment.entity.AllotmentObjectExample;
-import com.sztzjy.fund_investment.entity.TrainingReport;
-import com.sztzjy.fund_investment.entity.dto.AllotmentObjectDTO;
-import com.sztzjy.fund_investment.entity.dto.TrainingReportDTO;
-import com.sztzjy.fund_investment.entity.dto.UserNameAndStudentIdDTO;
+import com.sztzjy.fund_investment.entity.*;
+import com.sztzjy.fund_investment.entity.dto.*;
 import com.sztzjy.fund_investment.mapper.AllotmentObjectMapper;
+import com.sztzjy.fund_investment.mapper.InquiryParticipationMapper;
+import com.sztzjy.fund_investment.mapper.PerformanceScoreMapper;
 import com.sztzjy.fund_investment.service.InquiryIssuanceService;
+import com.sztzjy.fund_investment.service.PerformanceScoreService;
 import com.sztzjy.fund_investment.util.ResultEntity;
 import com.sztzjy.fund_investment.util.excel.FilePortUtil;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.http.HttpStatus;
@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 
@@ -37,6 +38,12 @@ public class InquiryIssuanceController {
     InquiryIssuanceService inquiryIssuanceService;
     @Resource
     AllotmentObjectMapper allotmentObjectMapper;
+    @Resource
+    InquiryParticipationMapper inquiryParticipationMapper;
+    @Resource
+    PerformanceScoreMapper performanceScoreMapper;
+    @Resource
+    PerformanceScoreService performanceScoreService;
     @AnonymousAccess
     @GetMapping("/queryInquiryInvestors")
     @ApiOperation("询价投资者查看")
@@ -75,7 +82,7 @@ public class InquiryIssuanceController {
     @AnonymousAccess
     @GetMapping("/identifiedInvestorsExport")
     @ApiOperation("导出已确定投资者")
-    public void filePort(HttpServletResponse response, @RequestParam String flowId) {
+    public void identifiedInvestorsExport(HttpServletResponse response, @RequestParam String flowId) {
         //导出的表名
         String title = IdUtil.simpleUUID();
         //表中第一行表头字段
@@ -85,7 +92,14 @@ public class InquiryIssuanceController {
         AllotmentObjectExample allotmentObjectExample = new AllotmentObjectExample();
         allotmentObjectExample.createCriteria().andFlowIdEqualTo(flowId).andLogicEqualTo(1);
         List<AllotmentObject> allotmentObjectList = allotmentObjectMapper.selectByExample(allotmentObjectExample);
-
+        PerformanceScoreExample performanceScoreExample=new PerformanceScoreExample();
+        performanceScoreExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<PerformanceScore> performanceScores = performanceScoreMapper.selectByExample(performanceScoreExample);
+        if(performanceScores.size()>0){
+            if(performanceScores.get(0).getPricingIssuanceConfirmScore()==null){
+                performanceScoreService.calculateScoreByModule("pricing_issuance_confirm_score",3,flowId);
+            }
+        }
         //具体需要写入excel需要哪些字段，这些字段取自UserReward类，也就是上面的实际数据结果集的泛型
         List<String> listColumn = Arrays.asList("allotmentObjectCode", "allotmentObjectName", "allotmentObjectType", "investorCode","investorName","investorType");
         try {
@@ -110,11 +124,134 @@ public class InquiryIssuanceController {
         inquiryIssuanceService.uploadInitiatePreliminaryInquiry(fileName,flowId);
         return new ResultEntity<>(HttpStatus.OK,"上传成功");
     }
-//    @AnonymousAccess
-//    @GetMapping("/queryUserNameAndStudentId")
-//    @ApiOperation("投资者参与询价--经办人基础信息")
-//    public ResultEntity<UserNameAndStudentIdDTO> queryUserNameAndStudentId(String flowId){
-//        UserNameAndStudentIdDTO userNameAndStudentIdDTO=inquiryIssuanceService.queryUserNameAndStudentId(flowId);
-//        return new ResultEntity<>(HttpStatus.OK,"成功",userNameAndStudentIdDTO);
-//    }
+    @AnonymousAccess
+    @GetMapping("/queryUserNameAndStudentId")
+    @ApiOperation("投资者参与询价--经办人基础信息")
+    public ResultEntity<UserNameAndStudentIdDTO> queryUserNameAndStudentId(String flowId){
+        UserNameAndStudentIdDTO userNameAndStudentIdDTO=inquiryIssuanceService.queryUserNameAndStudentId(flowId);
+        return new ResultEntity<>(HttpStatus.OK,"成功",userNameAndStudentIdDTO);
+    }
+
+    @AnonymousAccess
+    @GetMapping("/basicInformationStorage")
+    @ApiOperation("投资者参与询价--基本信息保存")
+    public ResultEntity basicInformationStorage(@RequestBody JSONObject jsonObject){
+        String objectivityEvaluation = jsonObject.getString("objectivityEvaluation");
+        String valuationMethodRationalityEvaluation = jsonObject.getString("valuationMethodRationalityEvaluation");
+        Integer overallEvaluation = jsonObject.getInteger("overallEvaluation");
+        String operator = jsonObject.getString("operator");
+        BigDecimal declarationPrice = jsonObject.getBigDecimal("declarationPrice");
+        String flowId = jsonObject.getString("flowId");
+        inquiryIssuanceService.basicInformationStorage(objectivityEvaluation,overallEvaluation,
+                                                       valuationMethodRationalityEvaluation,operator,declarationPrice,flowId);
+        return new ResultEntity<>(HttpStatus.OK,"保存成功");
+    }
+
+    @AnonymousAccess
+    @GetMapping("/queryQuotationList")
+    @ApiOperation("投资者参与询价--报价列表查看")
+    public ResultEntity<List<QuotationListDTO>> queryQuotationList(String flowId){
+        List<QuotationListDTO> list=inquiryIssuanceService.queryQuotationList(flowId);
+        return new ResultEntity<>(HttpStatus.OK,"成功",list);
+    }
+
+    @AnonymousAccess
+    @GetMapping("/dataEcho")
+    @ApiOperation("投资者参与询价--添加报价数据回显")
+    public ResultEntity<InquiryParticipationDTO> dataEcho(String flowId,String id){
+        InquiryParticipationDTO inquiryParticipation=inquiryIssuanceService.dataEcho(flowId,id);
+        return new ResultEntity<>(HttpStatus.OK,"成功",inquiryParticipation);
+    }
+
+    @AnonymousAccess
+    @GetMapping("/insertQuotation")
+    @ApiOperation("投资者参与询价--添加报价")
+    public ResultEntity insertQuotation(@RequestBody JSONObject jsonObject){
+        InquiryParticipation inquiryParticipation = jsonObject.getObject("InquiryParticipation", InquiryParticipation.class);
+        inquiryIssuanceService.insertQuotation(inquiryParticipation);
+        return new ResultEntity<>(HttpStatus.OK,"添加成功");
+    }
+
+    @AnonymousAccess
+    @GetMapping("/exportQuotation")
+    @ApiOperation("投资者参与询价--导出报价")
+    public void exportQuotation(HttpServletResponse response, @RequestParam String flowId) {
+        //导出的表名
+        String title = IdUtil.simpleUUID();
+        //表中第一行表头字段
+        String[] headers = {"配售对象编码", "客观性评价", "估值方法合理性评价", "总体评价(1-100整数)","经办人","经办人电话","申报价格","拟申购数量(万股)",
+                            "证券账户","托管席位","自愿锁定","备注信息","总金额","提交时间"};
+
+        //实际数据结果集
+        InquiryParticipationExample inquiryParticipationExample = new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId).andStatusEqualTo("1");
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+
+        //具体需要写入excel需要哪些字段，这些字段取自UserReward类，也就是上面的实际数据结果集的泛型
+        List<String> listColumn = Arrays.asList("allotmentObjectCode", "objectivityEvaluation", "valuationMethodRationalityEvaluation", "overallEvaluation",
+                "operator","operatorPhone","declarationPrice","intendedSubscriptionQuantity","securitiesAccount","custodianSeat","voluntaryLockup","totalAmount",
+                "submissionTime");
+        try {
+            FilePortUtil.exportExcel(response, title, headers, inquiryParticipations, listColumn);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AnonymousAccess
+    @GetMapping("/queryPreliminaryStructureOfInquiry")
+    @ApiOperation("询价结果查询--初步询价结果查看")
+    public ResultEntity<PageInfo<PreliminaryStructureOfInquiryDTO>> queryPreliminaryStructureOfInquiry(@ApiParam("流程ID") String flowId,
+                                                                                                       @ApiParam("每页条数") Integer size,
+                                                                                                       @ApiParam("当前页") Integer index){
+        PageInfo<PreliminaryStructureOfInquiryDTO> pageInfo=inquiryIssuanceService.queryPreliminaryStructureOfInquiry(flowId,size,index);
+        return new ResultEntity<>(HttpStatus.OK,"成功",pageInfo);
+    }
+
+    @AnonymousAccess
+    @GetMapping("/queryByPlacingObjectsName")
+    @ApiOperation("询价结果查询--根据配售对象名称查询")
+    public ResultEntity<PageInfo<PreliminaryStructureOfInquiryDTO>> queryByPlacingObjectsName(@ApiParam("流程ID") String flowId,
+                                                                                              @ApiParam("每页条数") Integer size,
+                                                                                              @ApiParam("当前页") Integer index,
+                                                                                              @ApiParam("配售对象名称") String allotmentObjectName){
+        PageInfo<PreliminaryStructureOfInquiryDTO> pageInfo=inquiryIssuanceService.queryByPlacingObjectsName(flowId,size,index,allotmentObjectName);
+        return new ResultEntity<>(HttpStatus.OK,"成功",pageInfo);
+    }
+
+    @AnonymousAccess
+    @GetMapping("/exportInquiryResults")
+    @ApiOperation("投资者参与询价--询价结果")
+    public void exportInquiryResults(HttpServletResponse response, @RequestParam String flowId) {
+        //导出的表名
+        String title = IdUtil.simpleUUID();
+        //表中第一行表头字段
+        String[] headers = { "投资者名称","配售对象名称","申报价格(元)","拟申购数量(万股)","提交时间"};
+
+        //实际数据结果集
+        List<PreliminaryStructureOfInquiryDTO> preliminaryStructureOfInquiryDTOS=inquiryIssuanceService.exportInquiryResults(flowId);
+
+        //具体需要写入excel需要哪些字段，这些字段取自UserReward类，也就是上面的实际数据结果集的泛型
+        List<String> listColumn = Arrays.asList("investorName", "allotmentObjectName", "declarationPrice", "intendedSubscriptionQuantity","submissionTime");
+        try {
+            FilePortUtil.exportExcel(response, title, headers, preliminaryStructureOfInquiryDTOS, listColumn);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @AnonymousAccess
+    @GetMapping("/viewQuotation")
+    @ApiOperation("询价结果查询--查看报价")
+    public ResultEntity<QuotationDTO> viewQuotation(String flowId){
+        QuotationDTO quotationDTO=inquiryIssuanceService.viewQuotation(flowId);
+        return new ResultEntity<>(HttpStatus.OK,"成功",quotationDTO);
+    }
+    @AnonymousAccess
+    @GetMapping("/viewHistoricalQuotation")
+    @ApiOperation("询价结果查询--查看历史报价")
+    public ResultEntity<List<QuotationDTO>> viewHistoricalQuotation(String flowId){
+        List<QuotationDTO> list=inquiryIssuanceService.viewHistoricalQuotation(flowId);
+        return new ResultEntity<>(HttpStatus.OK,"成功",list);
+    }
 }

src/main/java/com/sztzjy/fund_investment/entity/InquiryParticipation.java

@@ -1,6 +1,7 @@
 package com.sztzjy.fund_investment.entity;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import io.swagger.annotations.ApiModelProperty;
 /**
@@ -15,7 +16,10 @@ public class InquiryParticipation {
     private String flowId;
 
     @ApiModelProperty("配售对象编码")
-    private Integer allotmentObjectCode;
+    private String allotmentObjectCode;
+
+    @ApiModelProperty("配售对象名称")
+    private String allotmentObjectName;
 
     @ApiModelProperty("客观性评价")
     private String objectivityEvaluation;
@@ -50,7 +54,10 @@ public class InquiryParticipation {
     @ApiModelProperty("总金额")
     private BigDecimal totalAmount;
 
-    @ApiModelProperty("状态")
+    @ApiModelProperty("提交时间")
+    private Date submissionTime;
+
+    @ApiModelProperty("状态(0、未提交报价 1、已提交报价 默认0)")
     private String status;
 
     @ApiModelProperty("备注信息")
@@ -72,12 +79,20 @@ public class InquiryParticipation {
         this.flowId = flowId == null ? null : flowId.trim();
     }
 
-    public Integer getAllotmentObjectCode() {
+    public String getAllotmentObjectCode() {
         return allotmentObjectCode;
     }
 
-    public void setAllotmentObjectCode(Integer allotmentObjectCode) {
-        this.allotmentObjectCode = allotmentObjectCode;
+    public void setAllotmentObjectCode(String allotmentObjectCode) {
+        this.allotmentObjectCode = allotmentObjectCode == null ? null : allotmentObjectCode.trim();
+    }
+
+    public String getAllotmentObjectName() {
+        return allotmentObjectName;
+    }
+
+    public void setAllotmentObjectName(String allotmentObjectName) {
+        this.allotmentObjectName = allotmentObjectName == null ? null : allotmentObjectName.trim();
     }
 
     public String getObjectivityEvaluation() {
@@ -168,6 +183,14 @@ public class InquiryParticipation {
         this.totalAmount = totalAmount;
     }
 
+    public Date getSubmissionTime() {
+        return submissionTime;
+    }
+
+    public void setSubmissionTime(Date submissionTime) {
+        this.submissionTime = submissionTime;
+    }
+
     public String getStatus() {
         return status;
     }

src/main/java/com/sztzjy/fund_investment/entity/InquiryParticipationExample.java

@@ -2,6 +2,7 @@ package com.sztzjy.fund_investment.entity;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 public class InquiryParticipationExample {
@@ -255,56 +256,136 @@ public class InquiryParticipationExample {
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeEqualTo(Integer value) {
+        public Criteria andAllotmentObjectCodeEqualTo(String value) {
             addCriterion("allotment_object_code =", value, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeNotEqualTo(Integer value) {
+        public Criteria andAllotmentObjectCodeNotEqualTo(String value) {
             addCriterion("allotment_object_code <>", value, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeGreaterThan(Integer value) {
+        public Criteria andAllotmentObjectCodeGreaterThan(String value) {
             addCriterion("allotment_object_code >", value, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeGreaterThanOrEqualTo(Integer value) {
+        public Criteria andAllotmentObjectCodeGreaterThanOrEqualTo(String value) {
             addCriterion("allotment_object_code >=", value, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeLessThan(Integer value) {
+        public Criteria andAllotmentObjectCodeLessThan(String value) {
             addCriterion("allotment_object_code <", value, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeLessThanOrEqualTo(Integer value) {
+        public Criteria andAllotmentObjectCodeLessThanOrEqualTo(String value) {
             addCriterion("allotment_object_code <=", value, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeIn(List<Integer> values) {
+        public Criteria andAllotmentObjectCodeLike(String value) {
+            addCriterion("allotment_object_code like", value, "allotmentObjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectCodeNotLike(String value) {
+            addCriterion("allotment_object_code not like", value, "allotmentObjectCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectCodeIn(List<String> values) {
             addCriterion("allotment_object_code in", values, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeNotIn(List<Integer> values) {
+        public Criteria andAllotmentObjectCodeNotIn(List<String> values) {
             addCriterion("allotment_object_code not in", values, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeBetween(Integer value1, Integer value2) {
+        public Criteria andAllotmentObjectCodeBetween(String value1, String value2) {
             addCriterion("allotment_object_code between", value1, value2, "allotmentObjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andAllotmentObjectCodeNotBetween(Integer value1, Integer value2) {
+        public Criteria andAllotmentObjectCodeNotBetween(String value1, String value2) {
             addCriterion("allotment_object_code not between", value1, value2, "allotmentObjectCode");
             return (Criteria) this;
         }
 
+        public Criteria andAllotmentObjectNameIsNull() {
+            addCriterion("allotment_object_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameIsNotNull() {
+            addCriterion("allotment_object_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameEqualTo(String value) {
+            addCriterion("allotment_object_name =", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameNotEqualTo(String value) {
+            addCriterion("allotment_object_name <>", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameGreaterThan(String value) {
+            addCriterion("allotment_object_name >", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameGreaterThanOrEqualTo(String value) {
+            addCriterion("allotment_object_name >=", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameLessThan(String value) {
+            addCriterion("allotment_object_name <", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameLessThanOrEqualTo(String value) {
+            addCriterion("allotment_object_name <=", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameLike(String value) {
+            addCriterion("allotment_object_name like", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameNotLike(String value) {
+            addCriterion("allotment_object_name not like", value, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameIn(List<String> values) {
+            addCriterion("allotment_object_name in", values, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameNotIn(List<String> values) {
+            addCriterion("allotment_object_name not in", values, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameBetween(String value1, String value2) {
+            addCriterion("allotment_object_name between", value1, value2, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAllotmentObjectNameNotBetween(String value1, String value2) {
+            addCriterion("allotment_object_name not between", value1, value2, "allotmentObjectName");
+            return (Criteria) this;
+        }
+
         public Criteria andObjectivityEvaluationIsNull() {
             addCriterion("objectivity_evaluation is null");
             return (Criteria) this;
@@ -1025,6 +1106,66 @@ public class InquiryParticipationExample {
             return (Criteria) this;
         }
 
+        public Criteria andSubmissionTimeIsNull() {
+            addCriterion("submission_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeIsNotNull() {
+            addCriterion("submission_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeEqualTo(Date value) {
+            addCriterion("submission_time =", value, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeNotEqualTo(Date value) {
+            addCriterion("submission_time <>", value, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeGreaterThan(Date value) {
+            addCriterion("submission_time >", value, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("submission_time >=", value, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeLessThan(Date value) {
+            addCriterion("submission_time <", value, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeLessThanOrEqualTo(Date value) {
+            addCriterion("submission_time <=", value, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeIn(List<Date> values) {
+            addCriterion("submission_time in", values, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeNotIn(List<Date> values) {
+            addCriterion("submission_time not in", values, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeBetween(Date value1, Date value2) {
+            addCriterion("submission_time between", value1, value2, "submissionTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSubmissionTimeNotBetween(Date value1, Date value2) {
+            addCriterion("submission_time not between", value1, value2, "submissionTime");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusIsNull() {
             addCriterion("status is null");
             return (Criteria) this;

src/main/java/com/sztzjy/fund_investment/entity/dto/InquiryParticipationDTO.java

@@ -0,0 +1,22 @@
+package com.sztzjy.fund_investment.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author tz
+ * @date 2023/12/6 15:54
+ */
+@Data
+public class InquiryParticipationDTO {
+    @ApiModelProperty("配售对象名称")
+    private String allotmentObjectName;
+    @ApiModelProperty("证券账户")
+    private String securitiesAccount;
+    @ApiModelProperty("托管席位")
+    private String custodianSeat;
+    @ApiModelProperty("申报价格")
+    private BigDecimal declarationPrice;
+}

src/main/java/com/sztzjy/fund_investment/entity/dto/PreliminaryStructureOfInquiryDTO.java

@@ -0,0 +1,29 @@
+package com.sztzjy.fund_investment.entity.dto;
+
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author tz
+ * @date 2023/12/8 16:47
+ */
+@Data
+public class PreliminaryStructureOfInquiryDTO {
+    @ApiModelProperty("投资者名称")
+    private String investorName;
+
+    @ApiModelProperty("配售对象名称")
+    private String allotmentObjectName;
+
+    @ApiModelProperty("申报价格")
+    private BigDecimal declarationPrice;
+
+    @ApiModelProperty("拟申购数量(万股)")
+    private BigDecimal intendedSubscriptionQuantity;
+
+    @ApiModelProperty("提交时间")
+    private Date submissionTime;
+}

src/main/java/com/sztzjy/fund_investment/entity/dto/QuotationDTO.java

@@ -0,0 +1,18 @@
+package com.sztzjy.fund_investment.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author tz
+ * @date 2023/12/11 15:14
+ */
+@Data
+public class QuotationDTO {
+    @ApiModelProperty("申报价格")
+    private BigDecimal declarationPrice;
+    @ApiModelProperty("拟申购数量(万股)")
+    private BigDecimal intendedSubscriptionQuantity;
+}

src/main/java/com/sztzjy/fund_investment/entity/dto/QuotationListDTO.java

@@ -0,0 +1,41 @@
+package com.sztzjy.fund_investment.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author tz
+ * @date 2023/12/11 13:50
+ */
+@Data
+public class QuotationListDTO {
+    @ApiModelProperty("证券账户")
+    private String securitiesAccount;
+
+    @ApiModelProperty("托管席位")
+    private String custodianSeat;
+
+    @ApiModelProperty("自愿锁定")
+    private Byte voluntaryLockup;
+
+    @ApiModelProperty("申报价格")
+    private BigDecimal declarationPrice;
+
+    @ApiModelProperty("拟申购数量(万股)")
+    private BigDecimal intendedSubscriptionQuantity;
+
+    @ApiModelProperty("总金额")
+    private BigDecimal totalAmount;
+
+    @ApiModelProperty("提交时间")
+    private Date submissionTime;
+
+    @ApiModelProperty("状态(0、未提交报价 1、已提交报价 默认0)")
+    private String status;
+
+    @ApiModelProperty("备注信息")
+    private String remark;
+}

src/main/java/com/sztzjy/fund_investment/service/InquiryIssuanceService.java

@@ -1,11 +1,11 @@
 package com.sztzjy.fund_investment.service;
 
 import com.github.pagehelper.PageInfo;
+import com.sztzjy.fund_investment.entity.InquiryParticipation;
 import com.sztzjy.fund_investment.entity.TrainingReport;
-import com.sztzjy.fund_investment.entity.dto.AllotmentObjectDTO;
-import com.sztzjy.fund_investment.entity.dto.TrainingReportDTO;
-import com.sztzjy.fund_investment.entity.dto.UserNameAndStudentIdDTO;
+import com.sztzjy.fund_investment.entity.dto.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -25,5 +25,23 @@ public interface InquiryIssuanceService {
 
     void uploadInitiatePreliminaryInquiry(String fileName,String flowId);
 
-//    UserNameAndStudentIdDTO queryUserNameAndStudentId(String flowId);
+    UserNameAndStudentIdDTO queryUserNameAndStudentId(String flowId);
+
+    void basicInformationStorage(String objectivityEvaluation, Integer overallEvaluation, String valuationMethodRationalityEvaluation, String operator, BigDecimal declarationPrice,String flowId);
+
+    List<QuotationListDTO> queryQuotationList(String flowId);
+
+    InquiryParticipationDTO dataEcho(String flowId,String id);
+
+    void insertQuotation(InquiryParticipation inquiryParticipation);
+
+    PageInfo<PreliminaryStructureOfInquiryDTO> queryPreliminaryStructureOfInquiry(String flowId, Integer size, Integer index);
+
+    PageInfo<PreliminaryStructureOfInquiryDTO> queryByPlacingObjectsName(String flowId, Integer size, Integer index, String allotmentObjectName);
+
+    List<PreliminaryStructureOfInquiryDTO> exportInquiryResults(String flowId);
+
+    QuotationDTO viewQuotation(String flowId);
+
+    List<QuotationDTO> viewHistoricalQuotation(String flowId);
 }

src/main/java/com/sztzjy/fund_investment/service/serviceImpl/InquiryIssuanceServiceImpl.java

@@ -1,20 +1,18 @@
 package com.sztzjy.fund_investment.service.serviceImpl;
 
+import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sztzjy.fund_investment.entity.*;
-import com.sztzjy.fund_investment.entity.dto.AllotmentObjectDTO;
-import com.sztzjy.fund_investment.entity.dto.TrainingReportDTO;
-import com.sztzjy.fund_investment.entity.dto.UserNameAndStudentIdDTO;
-import com.sztzjy.fund_investment.mapper.AllotmentObjectMapper;
-import com.sztzjy.fund_investment.mapper.FlowMapper;
-import com.sztzjy.fund_investment.mapper.TrainingReportMapper;
-import com.sztzjy.fund_investment.mapper.UserTableMapper;
+import com.sztzjy.fund_investment.entity.dto.*;
+import com.sztzjy.fund_investment.mapper.*;
 import com.sztzjy.fund_investment.service.InquiryIssuanceService;
+import com.sztzjy.fund_investment.service.PerformanceScoreService;
 import com.sztzjy.fund_investment.util.ConvertUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -35,7 +33,15 @@ public class InquiryIssuanceServiceImpl implements InquiryIssuanceService {
     @Resource
     FlowMapper flowMapper;
     @Resource
-    UserTableMapper userTableMapper;
+    UserMapper userMapper;
+    @Resource
+    InquiryParticipationMapper inquiryParticipationMapper;
+    @Resource
+    IssuanceInfoMapper issuanceInfoMapper;
+    @Resource
+    PerformanceScoreService performanceScoreService;
+    @Resource
+    PerformanceScoreMapper performanceScoreMapper;
     @Override
     public PageInfo<AllotmentObjectDTO> queryInquiryInvestors(String flowId, Integer size, Integer index) {
         //开启分页
@@ -261,18 +267,205 @@ public class InquiryIssuanceServiceImpl implements InquiryIssuanceService {
         }
     }
 
-//    @Override
-//    public UserNameAndStudentIdDTO queryUserNameAndStudentId(String flowId) {
-//        FlowExample flowExample=new FlowExample();
-//        flowExample.createCriteria().andFlowIdEqualTo(flowId);
-//        List<Flow> flows = flowMapper.selectByExample(flowExample);
-//        if(flows.size()>0){
-//            String userid = flows.get(0).getUserid();
-//            UserTable userTable = userTableMapper.selectByPrimaryKey(userid);
-//            UserNameAndStudentIdDTO userNameAndStudentIdDTO = convertUtil.entityToDTO(userTable, UserNameAndStudentIdDTO.class);
-//            return userNameAndStudentIdDTO;
-//        }else {
-//            throw new RuntimeException("请按流程操作");
-//        }
-//    }
+    @Override
+    public UserNameAndStudentIdDTO queryUserNameAndStudentId(String flowId) {
+        FlowExample flowExample=new FlowExample();
+        flowExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<Flow> flows = flowMapper.selectByExample(flowExample);
+        if(flows.size()>0){
+            String userid = flows.get(0).getUserid();
+            User user = userMapper.selectByPrimaryKey(userid);
+            UserNameAndStudentIdDTO userNameAndStudentIdDTO = convertUtil.entityToDTO(user, UserNameAndStudentIdDTO.class);
+            return userNameAndStudentIdDTO;
+        }else {
+            throw new RuntimeException("请按流程操作");
+        }
+    }
+
+    @Override
+    public void basicInformationStorage(String objectivityEvaluation, Integer overallEvaluation, String valuationMethodRationalityEvaluation, String operator, BigDecimal declarationPrice,String flowId) {
+            InquiryParticipation inquiryParticipation=new InquiryParticipation();
+            inquiryParticipation.setId(String.valueOf(UUID.randomUUID()));
+            inquiryParticipation.setObjectivityEvaluation(objectivityEvaluation);
+            inquiryParticipation.setValuationMethodRationalityEvaluation(valuationMethodRationalityEvaluation);
+            inquiryParticipation.setOverallEvaluation(overallEvaluation);
+            inquiryParticipation.setOperator(operator);
+            inquiryParticipation.setDeclarationPrice(declarationPrice);
+            inquiryParticipation.setFlowId(flowId);
+            inquiryParticipation.setStatus("0");
+            inquiryParticipationMapper.insert(inquiryParticipation);
+    }
+
+    @Override
+    public List<QuotationListDTO> queryQuotationList(String flowId) {
+        InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId).andStatusEqualTo("1");
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+        List<QuotationListDTO> quotationListDTOS = convertUtil.entityToDTOList(inquiryParticipations, QuotationListDTO.class);
+        return quotationListDTOS;
+    }
+
+    @Override
+    public InquiryParticipationDTO dataEcho(String flowId,String id) {
+        IssuanceInfoExample issuanceInfoExample=new IssuanceInfoExample();
+        issuanceInfoExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<IssuanceInfo> issuanceInfos = issuanceInfoMapper.selectByExample(issuanceInfoExample);
+        if(issuanceInfos.size()>0){
+            //取到证券账户和托管席位
+            String remainingShareRegistrationAccountShenzhen = issuanceInfos.get(0).getRemainingShareRegistrationAccountShenzhen();
+            String remainingShareCustodianSeatShenzhen = issuanceInfos.get(0).getRemainingShareCustodianSeatShenzhen();
+            //赋值到InquiryParticipationDTO
+            InquiryParticipationDTO inquiryParticipationDTO=new InquiryParticipationDTO();
+            inquiryParticipationDTO.setAllotmentObjectName("皖西基金管理有限公司");
+            inquiryParticipationDTO.setSecuritiesAccount(remainingShareRegistrationAccountShenzhen);
+            inquiryParticipationDTO.setCustodianSeat(remainingShareCustodianSeatShenzhen);
+            //取到申报价格
+            InquiryParticipation inquiryParticipation = inquiryParticipationMapper.selectByPrimaryKey(id);
+            inquiryParticipationDTO.setDeclarationPrice(inquiryParticipation.getDeclarationPrice());
+            return inquiryParticipationDTO;
+        }else {
+            throw new RuntimeException("请按流程操作");
+        }
+    }
+
+    @Override
+    public void insertQuotation(InquiryParticipation inquiryParticipation) {
+        AllotmentObjectExample allotmentObjectExample=new AllotmentObjectExample();
+        allotmentObjectExample.createCriteria().andFlowIdEqualTo(inquiryParticipation.getFlowId());
+        List<AllotmentObject> list = allotmentObjectMapper.selectByExample(allotmentObjectExample);
+        if(list.size()>0){
+            //赋值
+            InquiryParticipation inquiryParticipation1 = inquiryParticipationMapper.selectByPrimaryKey(inquiryParticipation.getId());
+            inquiryParticipation1.setAllotmentObjectCode(list.get(0).getAllotmentObjectCode());
+            inquiryParticipation1.setAllotmentObjectName(inquiryParticipation.getAllotmentObjectName());
+            inquiryParticipation1.setSecuritiesAccount(inquiryParticipation.getSecuritiesAccount());
+            inquiryParticipation1.setCustodianSeat(inquiryParticipation.getCustodianSeat());
+            inquiryParticipation1.setVoluntaryLockup(inquiryParticipation.getVoluntaryLockup());
+            inquiryParticipation.setRemark(inquiryParticipation.getRemark());
+            inquiryParticipation1.setDeclarationPrice(inquiryParticipation.getDeclarationPrice());
+            inquiryParticipation1.setIntendedSubscriptionQuantity(inquiryParticipation.getIntendedSubscriptionQuantity());
+            inquiryParticipationMapper.updateByPrimaryKey(inquiryParticipation1);
+            PerformanceScoreExample performanceScoreExample=new PerformanceScoreExample();
+            performanceScoreExample.createCriteria().andFlowIdEqualTo(inquiryParticipation.getFlowId());
+            List<PerformanceScore> performanceScores = performanceScoreMapper.selectByExample(performanceScoreExample);
+            if(performanceScores.size()>0){
+                if(performanceScores.get(0).getInitPricingIssuanceScore()==null){
+                    performanceScoreService.calculateScoreByModule("init_pricing_issuance_score",3,inquiryParticipation.getFlowId());
+                }
+            }
+        }
+    }
+
+    @Override
+    public PageInfo<PreliminaryStructureOfInquiryDTO> queryPreliminaryStructureOfInquiry(String flowId, Integer size, Integer index) {
+        PageHelper.startPage(size,index);
+        //查询询价投资者列表
+        AllotmentObjectExample allotmentObjectExample=new AllotmentObjectExample();
+        allotmentObjectExample.createCriteria().andFlowIdEqualTo(flowId).andLogicEqualTo(1);
+        List<AllotmentObject> allotmentObjects = allotmentObjectMapper.selectByExample(allotmentObjectExample);
+        //查询报价列表
+        InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+        if(allotmentObjects.isEmpty() && inquiryParticipations.isEmpty()){
+            List<PreliminaryStructureOfInquiryDTO> preliminaryStructureOfInquiryDTOS = convertUtil.entityToDTOList(inquiryParticipations, PreliminaryStructureOfInquiryDTO.class);
+            for (int i = 0; i < inquiryParticipations.size(); i++) {
+                for (int j = 0; j < allotmentObjects.size(); j++) {
+                    if(inquiryParticipations.get(i).getAllotmentObjectCode()
+                            .equals(allotmentObjects.get(j).getAllotmentObjectCode())){
+                        //查询投资者和配售对象名称并赋值
+                        preliminaryStructureOfInquiryDTOS.get(i).setInvestorName(allotmentObjects.get(j).getInvestorName());
+                        preliminaryStructureOfInquiryDTOS.get(i).setAllotmentObjectName(allotmentObjects.get(j).getAllotmentObjectName());
+                    }
+                }
+            }
+            PageInfo<PreliminaryStructureOfInquiryDTO> pageInfo=new PageInfo<>(preliminaryStructureOfInquiryDTOS);
+            return pageInfo;
+        }else {
+            throw new RuntimeException("请按流程操作");
+        }
+    }
+
+    @Override
+    public PageInfo<PreliminaryStructureOfInquiryDTO> queryByPlacingObjectsName(String flowId, Integer size, Integer index, String allotmentObjectName) {
+        PageHelper.startPage(size,index);
+        //查询询价投资者列表
+        AllotmentObjectExample allotmentObjectExample=new AllotmentObjectExample();
+        allotmentObjectExample.createCriteria().andFlowIdEqualTo(flowId).andAllotmentObjectNameLike("%"+allotmentObjectName+"%");
+        List<AllotmentObject> allotmentObjects = allotmentObjectMapper.selectByExample(allotmentObjectExample);
+        //查询报价列表
+        InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+        if(allotmentObjects.isEmpty() && inquiryParticipations.isEmpty()){
+            List<PreliminaryStructureOfInquiryDTO> preliminaryStructureOfInquiryDTOS = convertUtil.entityToDTOList(allotmentObjects, PreliminaryStructureOfInquiryDTO.class);
+            for (int i = 0; i < allotmentObjects.size(); i++) {
+                for (int j = 0; j < inquiryParticipations.size(); j++) {
+                    if(allotmentObjects.get(i).getAllotmentObjectCode()
+                            .equals(inquiryParticipations.get(j).getAllotmentObjectCode())){
+                        //查询投资者和配售对象名称并赋值
+                        preliminaryStructureOfInquiryDTOS.get(i).setIntendedSubscriptionQuantity(inquiryParticipations.get(j).getIntendedSubscriptionQuantity());
+                        preliminaryStructureOfInquiryDTOS.get(i).setDeclarationPrice(inquiryParticipations.get(j).getDeclarationPrice());
+                        preliminaryStructureOfInquiryDTOS.get(i).setSubmissionTime(inquiryParticipations.get(j).getSubmissionTime());
+                    }
+                }
+            }
+            PageInfo<PreliminaryStructureOfInquiryDTO> pageInfo=new PageInfo<>(preliminaryStructureOfInquiryDTOS);
+            return pageInfo;
+        }else {
+            throw new RuntimeException("请按流程操作");
+        }
+    }
+
+    @Override
+    public List<PreliminaryStructureOfInquiryDTO> exportInquiryResults(String flowId) {
+        //查询询价投资者列表
+        AllotmentObjectExample allotmentObjectExample=new AllotmentObjectExample();
+        allotmentObjectExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<AllotmentObject> allotmentObjects = allotmentObjectMapper.selectByExample(allotmentObjectExample);
+        //查询报价列表
+        InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId);
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+        if(allotmentObjects.isEmpty() && inquiryParticipations.isEmpty()){
+            List<PreliminaryStructureOfInquiryDTO> preliminaryStructureOfInquiryDTOS = convertUtil.entityToDTOList(inquiryParticipations, PreliminaryStructureOfInquiryDTO.class);
+            for (int i = 0; i < inquiryParticipations.size(); i++) {
+                for (int j = 0; j < allotmentObjects.size(); j++) {
+                    if(inquiryParticipations.get(i).getAllotmentObjectCode()
+                            .equals(allotmentObjects.get(j).getAllotmentObjectCode())){
+                        //查询投资者和配售对象名称并赋值
+                        preliminaryStructureOfInquiryDTOS.get(i).setInvestorName(allotmentObjects.get(j).getInvestorName());
+                        preliminaryStructureOfInquiryDTOS.get(i).setAllotmentObjectName(allotmentObjects.get(j).getAllotmentObjectName());
+                    }
+                }
+            }
+            return preliminaryStructureOfInquiryDTOS;
+        }else {
+            throw new RuntimeException("请按流程操作");
+        }
+    }
+
+    @Override
+    public QuotationDTO viewQuotation(String flowId) {
+        InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId).andStatusEqualTo("1");
+        inquiryParticipationExample.setOrderByClause("submission_time desc");
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+        if(inquiryParticipations.size()>0){
+            InquiryParticipation inquiryParticipation = inquiryParticipations.get(0);
+            QuotationDTO quotationDTO = convertUtil.entityToDTO(inquiryParticipation, QuotationDTO.class);
+            return quotationDTO;
+        }else {
+            throw new RuntimeException("请按流程操作");
+        }
+    }
+
+    @Override
+    public List<QuotationDTO> viewHistoricalQuotation(String flowId) {
+        InquiryParticipationExample inquiryParticipationExample=new InquiryParticipationExample();
+        inquiryParticipationExample.createCriteria().andFlowIdEqualTo(flowId).andStatusEqualTo("1");
+        List<InquiryParticipation> inquiryParticipations = inquiryParticipationMapper.selectByExample(inquiryParticipationExample);
+        List<QuotationDTO> quotationDTOS = convertUtil.entityToDTOList(inquiryParticipations, QuotationDTO.class);
+        return quotationDTOS;
+    }
 }

src/main/resources/mappers/InquiryParticipationMapper.xml

@@ -4,7 +4,8 @@
   <resultMap id="BaseResultMap" type="com.sztzjy.fund_investment.entity.InquiryParticipation">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="flow_id" jdbcType="VARCHAR" property="flowId" />
-    <result column="allotment_object_code" jdbcType="INTEGER" property="allotmentObjectCode" />
+    <result column="allotment_object_code" jdbcType="VARCHAR" property="allotmentObjectCode" />
+    <result column="allotment_object_name" jdbcType="VARCHAR" property="allotmentObjectName" />
     <result column="objectivity_evaluation" jdbcType="VARCHAR" property="objectivityEvaluation" />
     <result column="valuation_method_rationality_evaluation" jdbcType="VARCHAR" property="valuationMethodRationalityEvaluation" />
     <result column="overall_evaluation" jdbcType="INTEGER" property="overallEvaluation" />
@@ -16,6 +17,7 @@
     <result column="custodian_seat" jdbcType="VARCHAR" property="custodianSeat" />
     <result column="voluntary_lockup" jdbcType="TINYINT" property="voluntaryLockup" />
     <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
+    <result column="submission_time" jdbcType="TIMESTAMP" property="submissionTime" />
     <result column="status" jdbcType="VARCHAR" property="status" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.sztzjy.fund_investment.entity.InquiryParticipation">
@@ -80,9 +82,10 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, flow_id, allotment_object_code, objectivity_evaluation, valuation_method_rationality_evaluation, 
-    overall_evaluation, operator, operator_phone, declaration_price, intended_subscription_quantity, 
-    securities_account, custodian_seat, voluntary_lockup, total_amount, status
+    id, flow_id, allotment_object_code, allotment_object_name, objectivity_evaluation, 
+    valuation_method_rationality_evaluation, overall_evaluation, operator, operator_phone, 
+    declaration_price, intended_subscription_quantity, securities_account, custodian_seat, 
+    voluntary_lockup, total_amount, submission_time, status
   </sql>
   <sql id="Blob_Column_List">
     remark
@@ -137,18 +140,20 @@
   </delete>
   <insert id="insert" parameterType="com.sztzjy.fund_investment.entity.InquiryParticipation">
     insert into inquiry_participation (id, flow_id, allotment_object_code, 
-      objectivity_evaluation, valuation_method_rationality_evaluation, 
-      overall_evaluation, operator, operator_phone, 
-      declaration_price, intended_subscription_quantity, 
-      securities_account, custodian_seat, voluntary_lockup, 
-      total_amount, status, remark
+      allotment_object_name, objectivity_evaluation, 
+      valuation_method_rationality_evaluation, overall_evaluation, 
+      operator, operator_phone, declaration_price, 
+      intended_subscription_quantity, securities_account, 
+      custodian_seat, voluntary_lockup, total_amount, 
+      submission_time, status, remark
       )
-    values (#{id,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR}, #{allotmentObjectCode,jdbcType=INTEGER}, 
-      #{objectivityEvaluation,jdbcType=VARCHAR}, #{valuationMethodRationalityEvaluation,jdbcType=VARCHAR}, 
-      #{overallEvaluation,jdbcType=INTEGER}, #{operator,jdbcType=VARCHAR}, #{operatorPhone,jdbcType=VARCHAR}, 
-      #{declarationPrice,jdbcType=DECIMAL}, #{intendedSubscriptionQuantity,jdbcType=DECIMAL}, 
-      #{securitiesAccount,jdbcType=VARCHAR}, #{custodianSeat,jdbcType=VARCHAR}, #{voluntaryLockup,jdbcType=TINYINT}, 
-      #{totalAmount,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}
+    values (#{id,jdbcType=VARCHAR}, #{flowId,jdbcType=VARCHAR}, #{allotmentObjectCode,jdbcType=VARCHAR}, 
+      #{allotmentObjectName,jdbcType=VARCHAR}, #{objectivityEvaluation,jdbcType=VARCHAR}, 
+      #{valuationMethodRationalityEvaluation,jdbcType=VARCHAR}, #{overallEvaluation,jdbcType=INTEGER}, 
+      #{operator,jdbcType=VARCHAR}, #{operatorPhone,jdbcType=VARCHAR}, #{declarationPrice,jdbcType=DECIMAL}, 
+      #{intendedSubscriptionQuantity,jdbcType=DECIMAL}, #{securitiesAccount,jdbcType=VARCHAR}, 
+      #{custodianSeat,jdbcType=VARCHAR}, #{voluntaryLockup,jdbcType=TINYINT}, #{totalAmount,jdbcType=DECIMAL}, 
+      #{submissionTime,jdbcType=TIMESTAMP}, #{status,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.sztzjy.fund_investment.entity.InquiryParticipation">
@@ -163,6 +168,9 @@
       <if test="allotmentObjectCode != null">
         allotment_object_code,
       </if>
+      <if test="allotmentObjectName != null">
+        allotment_object_name,
+      </if>
       <if test="objectivityEvaluation != null">
         objectivity_evaluation,
       </if>
@@ -196,6 +204,9 @@
       <if test="totalAmount != null">
         total_amount,
       </if>
+      <if test="submissionTime != null">
+        submission_time,
+      </if>
       <if test="status != null">
         status,
       </if>
@@ -211,7 +222,10 @@
         #{flowId,jdbcType=VARCHAR},
       </if>
       <if test="allotmentObjectCode != null">
-        #{allotmentObjectCode,jdbcType=INTEGER},
+        #{allotmentObjectCode,jdbcType=VARCHAR},
+      </if>
+      <if test="allotmentObjectName != null">
+        #{allotmentObjectName,jdbcType=VARCHAR},
       </if>
       <if test="objectivityEvaluation != null">
         #{objectivityEvaluation,jdbcType=VARCHAR},
@@ -246,6 +260,9 @@
       <if test="totalAmount != null">
         #{totalAmount,jdbcType=DECIMAL},
       </if>
+      <if test="submissionTime != null">
+        #{submissionTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="status != null">
         #{status,jdbcType=VARCHAR},
       </if>
@@ -270,7 +287,10 @@
         flow_id = #{record.flowId,jdbcType=VARCHAR},
       </if>
       <if test="record.allotmentObjectCode != null">
-        allotment_object_code = #{record.allotmentObjectCode,jdbcType=INTEGER},
+        allotment_object_code = #{record.allotmentObjectCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.allotmentObjectName != null">
+        allotment_object_name = #{record.allotmentObjectName,jdbcType=VARCHAR},
       </if>
       <if test="record.objectivityEvaluation != null">
         objectivity_evaluation = #{record.objectivityEvaluation,jdbcType=VARCHAR},
@@ -305,6 +325,9 @@
       <if test="record.totalAmount != null">
         total_amount = #{record.totalAmount,jdbcType=DECIMAL},
       </if>
+      <if test="record.submissionTime != null">
+        submission_time = #{record.submissionTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.status != null">
         status = #{record.status,jdbcType=VARCHAR},
       </if>
@@ -320,7 +343,8 @@
     update inquiry_participation
     set id = #{record.id,jdbcType=VARCHAR},
       flow_id = #{record.flowId,jdbcType=VARCHAR},
-      allotment_object_code = #{record.allotmentObjectCode,jdbcType=INTEGER},
+      allotment_object_code = #{record.allotmentObjectCode,jdbcType=VARCHAR},
+      allotment_object_name = #{record.allotmentObjectName,jdbcType=VARCHAR},
       objectivity_evaluation = #{record.objectivityEvaluation,jdbcType=VARCHAR},
       valuation_method_rationality_evaluation = #{record.valuationMethodRationalityEvaluation,jdbcType=VARCHAR},
       overall_evaluation = #{record.overallEvaluation,jdbcType=INTEGER},
@@ -332,6 +356,7 @@
       custodian_seat = #{record.custodianSeat,jdbcType=VARCHAR},
       voluntary_lockup = #{record.voluntaryLockup,jdbcType=TINYINT},
       total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      submission_time = #{record.submissionTime,jdbcType=TIMESTAMP},
       status = #{record.status,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -342,7 +367,8 @@
     update inquiry_participation
     set id = #{record.id,jdbcType=VARCHAR},
       flow_id = #{record.flowId,jdbcType=VARCHAR},
-      allotment_object_code = #{record.allotmentObjectCode,jdbcType=INTEGER},
+      allotment_object_code = #{record.allotmentObjectCode,jdbcType=VARCHAR},
+      allotment_object_name = #{record.allotmentObjectName,jdbcType=VARCHAR},
       objectivity_evaluation = #{record.objectivityEvaluation,jdbcType=VARCHAR},
       valuation_method_rationality_evaluation = #{record.valuationMethodRationalityEvaluation,jdbcType=VARCHAR},
       overall_evaluation = #{record.overallEvaluation,jdbcType=INTEGER},
@@ -354,6 +380,7 @@
       custodian_seat = #{record.custodianSeat,jdbcType=VARCHAR},
       voluntary_lockup = #{record.voluntaryLockup,jdbcType=TINYINT},
       total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      submission_time = #{record.submissionTime,jdbcType=TIMESTAMP},
       status = #{record.status,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -366,7 +393,10 @@
         flow_id = #{flowId,jdbcType=VARCHAR},
       </if>
       <if test="allotmentObjectCode != null">
-        allotment_object_code = #{allotmentObjectCode,jdbcType=INTEGER},
+        allotment_object_code = #{allotmentObjectCode,jdbcType=VARCHAR},
+      </if>
+      <if test="allotmentObjectName != null">
+        allotment_object_name = #{allotmentObjectName,jdbcType=VARCHAR},
       </if>
       <if test="objectivityEvaluation != null">
         objectivity_evaluation = #{objectivityEvaluation,jdbcType=VARCHAR},
@@ -401,6 +431,9 @@
       <if test="totalAmount != null">
         total_amount = #{totalAmount,jdbcType=DECIMAL},
       </if>
+      <if test="submissionTime != null">
+        submission_time = #{submissionTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="status != null">
         status = #{status,jdbcType=VARCHAR},
       </if>
@@ -413,7 +446,8 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.sztzjy.fund_investment.entity.InquiryParticipation">
     update inquiry_participation
     set flow_id = #{flowId,jdbcType=VARCHAR},
-      allotment_object_code = #{allotmentObjectCode,jdbcType=INTEGER},
+      allotment_object_code = #{allotmentObjectCode,jdbcType=VARCHAR},
+      allotment_object_name = #{allotmentObjectName,jdbcType=VARCHAR},
       objectivity_evaluation = #{objectivityEvaluation,jdbcType=VARCHAR},
       valuation_method_rationality_evaluation = #{valuationMethodRationalityEvaluation,jdbcType=VARCHAR},
       overall_evaluation = #{overallEvaluation,jdbcType=INTEGER},
@@ -425,6 +459,7 @@
       custodian_seat = #{custodianSeat,jdbcType=VARCHAR},
       voluntary_lockup = #{voluntaryLockup,jdbcType=TINYINT},
       total_amount = #{totalAmount,jdbcType=DECIMAL},
+      submission_time = #{submissionTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -432,7 +467,8 @@
   <update id="updateByPrimaryKey" parameterType="com.sztzjy.fund_investment.entity.InquiryParticipation">
     update inquiry_participation
     set flow_id = #{flowId,jdbcType=VARCHAR},
-      allotment_object_code = #{allotmentObjectCode,jdbcType=INTEGER},
+      allotment_object_code = #{allotmentObjectCode,jdbcType=VARCHAR},
+      allotment_object_name = #{allotmentObjectName,jdbcType=VARCHAR},
       objectivity_evaluation = #{objectivityEvaluation,jdbcType=VARCHAR},
       valuation_method_rationality_evaluation = #{valuationMethodRationalityEvaluation,jdbcType=VARCHAR},
       overall_evaluation = #{overallEvaluation,jdbcType=INTEGER},
@@ -444,6 +480,7 @@
       custodian_seat = #{custodianSeat,jdbcType=VARCHAR},
       voluntary_lockup = #{voluntaryLockup,jdbcType=TINYINT},
       total_amount = #{totalAmount,jdbcType=DECIMAL},
+      submission_time = #{submissionTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>