补录订单

.idea/GrepConsole.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GrepConsole">
+    <option name="pinnedGrepConsolesState">
+      <PinnedGrepConsolesState>
+        <option name="map">
+          <map>
+            <entry>
+              <key>
+                <RunConfigurationRef>
+                  <option name="icon" value="springBoot.svg)" />
+                  <option name="name" value="PlatFormApplication" />
+                </RunConfigurationRef>
+              </key>
+              <value>
+                <Pins />
+              </value>
+            </entry>
+          </map>
+        </option>
+      </PinnedGrepConsolesState>
+    </option>
+  </component>
+</project>

authentication/src/main/java/com/jzg/config/SecurityConfig.java

@@ -77,7 +77,7 @@ public class SecurityConfig {
         http.csrf().disable();
         http.authorizeHttpRequests(auth -> auth
                         .requestMatchers("/swagger-ui/**", "/v3/api-docs/**", "/swagger-resources/**", "/webjars/**", "/favicon.ico",
-                                "/auth/login","/auth/captchaById","/auth/register","/sendSmsCode","/appLogin","/smsCodeLogin").permitAll()
+                                "/auth/login","/auth/captchaById","/auth/register","/send/sendSmsCode/**","/appLogin","/smsCodeLogin","/appAuth/smsCodeLogin").permitAll()
                         .anyRequest().authenticated()  // 其他接口需认证
                 )
 //                .formLogin((form) -> form

authentication/src/main/java/com/jzg/controller/AppAuthController.java

@@ -31,6 +31,7 @@ import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,7 +46,7 @@ import java.util.regex.Pattern;
 @Slf4j
 @Tag(name="APP授权接口")
 @RestController
-@RequestMapping
+@RequestMapping("appAuth")
 public class AppAuthController {
 
     @Autowired
@@ -116,25 +117,33 @@ public class AppAuthController {
 
     @Operation(summary = "短信验证码登录")
     @PostMapping("smsCodeLogin")
-    public HttpResult smsCodeLogin(@RequestBody AppSmsCodeLogin smsCodeLogin){
+    public void smsCodeLogin(@Validated @RequestBody AppSmsCodeLogin smsCodeLogin) throws ServletException, IOException {
 
         SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, smsCodeLogin.getMobile()).or().eq(SysUser::getUsername, smsCodeLogin.getMobile()));
-        if (ObjectUtil.isNotEmpty(sysUser)){
-            return HttpResult.error("手机号已注册，请使用密码登录");
-        }
-   //     RBucket<Object> bucket = redissonClient.getBucket(RedisKeyConstants.SMS_CODE_KEY);
-//        if (Objects.isNull(bucket)){
-//            return HttpResult.error("短信验证码已过期");
-//        }
-//        String smsCode = bucket.get().toString();
-//        if (Objects.isNull(smsCode)){
-//            return HttpResult.error("短信验证码已过期");
-//        }
-//        if (!Objects.equals(smsCodeLogin.getSmsCode(), smsCode)){
-//            return HttpResult.error("短信验证码错误");
+//        if (ObjectUtil.isNotEmpty(sysUser)){
+//            throw new SystemException("手机号已注册，请使用密码登录");
 //        }
-        register(smsCodeLogin);
-        return HttpResult.ok();
+        RBucket<Object> bucket = redissonClient.getBucket(RedisKeyConstants.SMS_CODE_KEY + smsCodeLogin.getMobile());
+        if (Objects.isNull(bucket)){
+            throw new SystemException("短信验证码已过期");
+        }
+        if (!bucket.isExists()){
+            throw new SystemException("短信验证码已过期");
+        }
+        String smsCode = bucket.get().toString();
+        if (Objects.isNull(smsCode)){
+            throw new SystemException("短信验证码已过期");
+        }
+        if (!Objects.equals(smsCodeLogin.getSmsCode(), smsCode)){
+            throw new SystemException("短信验证码错误");
+        }
+        if(ObjectUtil.isNull(sysUser)){
+            register(smsCodeLogin);
+        }
+        AppLoginFormVo loginFormVo = new AppLoginFormVo();
+        loginFormVo.setMobile(smsCodeLogin.getMobile());
+        loginFormVo.setPassWord("12345678");
+        modifyPass(loginFormVo);
     }
 
 

authentication/src/main/java/com/jzg/controller/SendSmsCodeController.java

@@ -20,9 +20,9 @@ import java.net.URLEncoder;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
-@Tag(name="授权接口")
+@Tag(name="获取短信验证码")
 @RestController
-@RequestMapping
+@RequestMapping("/send")
 public class SendSmsCodeController {
 
 

authentication/src/main/java/com/jzg/filter/TokenAuthenticationFilter.java

@@ -1,18 +1,15 @@
 package com.jzg.filter;
 
 import com.alibaba.fastjson.JSONObject;
-import com.jzg.commons.exception.TokenExpireException;
 import com.jzg.config.JzgTokenService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import org.redisson.api.RedissonClient;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -44,10 +41,11 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
         doList.add("/swagger-ui/");
         doList.add("/v3/api-docs");
         doList.add("/webjars/");
-        doList.add("/sendSmsCode");
+        doList.add("/send/sendSmsCode");
         doList.add("/appLogin");
         doList.add("/smsCodeLogin");
         doList.add("/auth/publicKeyExchange");
+        doList.add("/appAuth/smsCodeLogin");
         String path = request.getRequestURI();
         for (String pattern : doList) {
             // 使用正则表达式匹配  .* 匹配所有以 pattern 开头的路径

commons/src/main/java/com/jzg/commons/config/DictEnumConfig.java

@@ -40,7 +40,7 @@ public class DictEnumConfig implements InitializingBean {
 
     @Override
     public void afterPropertiesSet() {
-        Reflections reflections = new Reflections("com.ydtech.constants.enums.dict");
+        Reflections reflections = new Reflections("com.jzg.commons.constants.dict");
         Set<Class<? extends IBaseEnum>> monitorClasses = reflections.getSubTypesOf(IBaseEnum.class);
 //        List<DictionaryManagement> dmList = new ArrayList<>();
         dictManageList = new ArrayList<DictionaryManagement>();

commons/src/main/java/com/jzg/commons/constants/dict/BusinessVehicleUse.java

@@ -0,0 +1,30 @@
+package com.jzg.commons.constants.dict;
+
+import com.jzg.commons.constants.DictEnum;
+import com.jzg.commons.constants.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "businessVehicleUse", desc = "（车辆用途）营业")
+public enum BusinessVehicleUse implements IBaseEnum {
+
+    BVU_01("01", "营业出租租赁", 1, 0),
+    BVU_02("02", "营业城市公交", 1, 0),
+    BVU_03("03", "营业公路客运", 1, 0),
+    BVU_04("04", "营业货运", 1, 0);
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+    public static final String TITLE = "BVU_";
+
+
+}

commons/src/main/java/com/jzg/commons/constants/dict/NatureOfVehicleUse.java

@@ -0,0 +1,64 @@
+package com.jzg.commons.constants.dict;
+
+import com.jzg.commons.constants.DictEnum;
+import com.jzg.commons.constants.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description: 车辆使用性质
+ * @author: wenks
+ * @date: 2023/9/15 15:48
+ **/
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "natureOfVehicleUse", desc = "车辆使用性质")
+public enum NatureOfVehicleUse implements IBaseEnum {
+
+    NOVU_01("01", "营业", 0, 0),
+    NOVU_02("02", "非营业", 0, 0);
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+
+    public static String getDesc(String code) {
+        for (NatureOfVehicleUse natureOfVehicleUse : NatureOfVehicleUse.values()) {
+            if (natureOfVehicleUse.getCode().equals(code)) {
+                return natureOfVehicleUse.getDesc();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取营业非营业属性
+     *
+     * @param code           车辆使用性质 编码
+     * @param vehicleUseCode 车辆用途 编码
+     * @return 车辆用途介绍
+     */
+    public static String getNatureOfVehicleUse(String code, String vehicleUseCode) {
+        String desc = "";
+        try {
+            if (NatureOfVehicleUse.NOVU_01.getCode().equals(code)) {
+                BusinessVehicleUse businessVehicleUse = BusinessVehicleUse.valueOf(BusinessVehicleUse.TITLE + vehicleUseCode);
+                desc = businessVehicleUse.getDesc();
+            } else if (NatureOfVehicleUse.NOVU_02.getCode().equals(code)) {
+                OutOfBusinessVehicleUse outOfBusinessVehicleUse =
+                        OutOfBusinessVehicleUse.valueOf(OutOfBusinessVehicleUse.TITLE + vehicleUseCode);
+                desc = outOfBusinessVehicleUse.getDesc();
+            }
+        } catch (Exception ignored) {
+        }
+        return desc;
+    }
+
+
+}

commons/src/main/java/com/jzg/commons/constants/dict/OutOfBusinessVehicleUse.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.constants.dict;
+
+import com.jzg.commons.constants.DictEnum;
+import com.jzg.commons.constants.IBaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+@DictEnum(key = "outOfBusinessVehicleUse", desc = "（车辆用途）非营业")
+public enum OutOfBusinessVehicleUse implements IBaseEnum {
+
+    OBVIOUS_05("05", "家庭自用", 1, 0),
+    OBVIOUS_06("06", "非营业机关", 2, 0),
+    OBVIOUS_07("07", "非营业企业", 3, 0),
+    OBVIOUS_08("08", "非营业货运", 4, 0);
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+    public static final String TITLE = "OBVIOUS_";
+
+    public static String getDesc(String code) {
+        for (OutOfBusinessVehicleUse item : values()) {
+            if (item.getCode().equals(code)) {
+                return item.getDesc();
+            }
+        }
+        return null;
+    }
+
+
+}

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersAdd.java

@@ -1,10 +1,7 @@
 package com.jzg.commons.entity.dto;
 
 
-import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersOther;
+import com.jzg.commons.entity.orders.po.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -29,4 +26,11 @@ public class InsOrdersAdd {
     @Schema(description = "订单其他信息")
     private InsOrdersOther insOrdersOther;
 
+    @Schema(description = "电子保单")
+    private InsOrdersExternalPolicy ordersExternalPolicy;
+
+    @Schema(description = "费用信息")
+    private InsOrdersExternalFee ordersExternal;
+
+
 }

commons/src/main/java/com/jzg/commons/entity/dto/InsTaskImagesAdd.java

@@ -0,0 +1,23 @@
+package com.jzg.commons.entity.dto;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "订单影像资料上传")
+public class  InsTaskImagesAdd {
+
+    @Schema(description = "报价单号")
+    private String quoteNo;
+
+    @Schema(description = "图片类型(C01车辆影像，C02车主身份证，C03投保人身份证，C04被保人身份证，C05验车照)")
+    private String imageType;
+
+    @Schema(description = "文件存储ID")
+    private String imageId;
+
+    @Schema(description = "排序")
+    private String sort;
+
+}

commons/src/main/java/com/jzg/commons/entity/dto/InsuranceInfo.java

@@ -7,17 +7,19 @@ import com.jzg.commons.entity.orders.po.InsOrdersTax;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Schema(description = "保险信息")
 @Data
 public class InsuranceInfo {
 
     @Schema(description = "险种类型")
-    private InsOrdersKind insOrdersKind;
+    private List<InsOrdersKind> insOrdersKindList;
 
     @Schema(description = "车船税")
     private InsOrdersTax insOrdersTax;
 
     @Schema(description = "险种信息")
-    private InsOrdersRisk insOrdersRisk;
+    private List<InsOrdersRisk> insOrdersRiskList;
 
 }

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrders.java

@@ -77,4 +77,10 @@ public class InsOrders extends BaseModel {
     @Schema(description = "是否暂存0-保存；1-暂存")
     private byte isTemporarily;
 
+    @Schema(description = "审核状态0-待审核；1-已审核;2-已驳回")
+    private byte auditStatus;
+
+    @Schema(description = "审核意见")
+    private String auditComments;
+
 }

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCarInfo.java

@@ -33,6 +33,9 @@ public class InsOrdersCarInfo extends BaseModel {
     @Schema(description = "年款")
     private String carYear;
 
+    @Schema(description = "排量")
+    private String displacement;
+
     @Schema(description = "座位数")
     private Integer seatCount;
 

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersExternalFee.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.entity.orders.po;
+
+
+import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "订单费用信息")
+public class InsOrdersExternalFee extends BaseModel {
+
+    @Schema(description = "订单号")
+    private String OrderNo;
+
+    @Schema(description = "交强手续费比例")
+    private String jqSuperviseCostsProportion;
+
+    @Schema(description = "交强跟单比例")
+    private String jqOtherCostsProportion;
+
+    @Schema(description = "商业手续费比例")
+    private String sySuperviseCostsProportion;
+
+    @Schema(description = "商业跟单比例")
+    private String syOtherCostsProportion;
+
+    @Schema(description = "非车手续费比例")
+    private String noSuperviseCostsProportion;
+
+    @Schema(description = "非车跟单比例")
+    private String noOtherCostsProportion;
+
+    @Schema(description = "是否现询 0. 是 1. 否")
+    private int costFlag;
+
+    @Schema(description = "费用id")
+    private Long costId;
+
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersExternalPolicy.java

@@ -0,0 +1,27 @@
+package com.jzg.commons.entity.orders.po;
+
+
+import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "电子保单")
+public class InsOrdersExternalPolicy extends BaseModel {
+
+    @Schema(description = "主键")
+    private String orderNo;;
+
+    @Schema(description = "交强保单")
+    private String jqPolicy;
+
+    @Schema(description = "商业保单")
+    private String syPolicy;
+
+    @Schema(description = "非车保单")
+    private String noPolicy;
+
+    @Schema(description = "交强电子标志")
+    private String jqSign;
+
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersOther.java

@@ -13,6 +13,9 @@ public class InsOrdersOther {
     @Schema(description = "订单号")
     private Long orderNo;
 
+    @Schema(description = "总评分")
+    private String scope;
+
     @Schema(description = "交强评分")
     private String jqScope;
 

commons/src/main/java/com/jzg/commons/entity/po/InsTaskImages.java

@@ -0,0 +1,29 @@
+package com.jzg.commons.entity.po;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "订单影像资料")
+@TableName(value = "ins_task_images")
+public class InsTaskImages extends BaseModel {
+
+    @Schema(description = "主键")
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    private String quoteNo;
+
+    private String imageType;
+
+    private String imageId;
+
+    private String sort;
+
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/InsOrdersVo.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.entity.dto.InsuranceInfo;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
@@ -9,6 +10,7 @@ import com.jzg.commons.entity.orders.po.InsOrdersOther;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -21,6 +23,28 @@ public class InsOrdersVo {
     @Schema(description = "订单号")
     private Long quoteNo;
 
+    @Schema(description = "所属机构")
+    private String companyName;
+
+    @Schema(description = "审核状态")
+    private byte auditStatus;
+
+    @Schema(description = "审核内容")
+    private String auditComments;
+
+    @Schema(description = "录单人")
+    private String createBy;
+
+    @Schema(description = "录单人")
+    private String auditId;
+
+    @Schema(description = "录单人")
+    private String auditName;
+
+    @Schema(description = "录单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
     @Schema(description = "订单信息")
     private InsOrders insOrders;
 

commons/src/main/java/com/jzg/commons/entity/vo/InsTaskImagesVo.java

@@ -0,0 +1,38 @@
+package com.jzg.commons.entity.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "订单影像资料VO")
+public class InsTaskImagesVo {
+
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "订单号")
+    private String quoteNo;
+
+    @Schema(description = "图片类型(C01车辆影像，C02车主身份证，C03投保人身份证，C04被保人身份证，C05验车照)")
+    private String imageType;
+
+    @Schema(description = "文件存储ID")
+    private String imageId;
+
+    @Schema(description = "排序")
+    private String sort;
+
+    @Schema(description = "图片地址")
+    private String fileName;
+
+    @Schema(description = "图片地址")
+    private String fileType;
+
+    @Schema(description = "图片地址")
+    private String bucketName;
+
+    @Schema(description = "预览地址")
+    private String previewUrl;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/OrdersListVo.java

@@ -0,0 +1,48 @@
+package com.jzg.commons.entity.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "订单列表VO")
+public class OrdersListVo {
+
+    @Schema(description = "订单ID")
+    private String id;
+
+    @Schema(description = "订单号")
+    private String quoteNo;
+
+    @Schema(description = "核保人")
+    private String auditId;
+
+    @Schema(description = "核保人姓名")
+    private String auditName;
+
+    @Schema(description = "业务员手归属")
+    private String salesmanCompany;
+
+    @Schema(description = "保险公司")
+    private String companyName;
+
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    @Schema(description = "交强险保费")
+    private String jqPremium;
+
+    @Schema(description = "商业险保费")
+    private String syPremium;
+
+    @Schema(description = "驾意险保费")
+    private String jyPremium;
+
+    @Schema(description = "总保费")
+    private String sumPremium;
+
+    @Schema(description = "车船税费用")
+    private String taxPremium;
+
+}

gateway/src/main/java/com/jzg/config/CorsConfig.java

@@ -1,22 +1,10 @@
 package com.jzg.config;
 
-import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.reactive.CorsUtils;
 import org.springframework.web.cors.reactive.CorsWebFilter;
 import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-import reactor.core.publisher.Mono;
 
 @Configuration
 public class CorsConfig {
@@ -29,6 +17,8 @@ public class CorsConfig {
         corsConfiguration.addAllowedOrigin("http://127.0.0.1:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.149:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.69:9000");
+        corsConfiguration.addAllowedOrigin("http://192.168.0.20:8080");
+        corsConfiguration.addAllowedOrigin("http://localhost:8080");
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9000");
         corsConfiguration.addAllowedOrigin("http://192.168.0.20:9001");
         corsConfiguration.addAllowedOrigin("http://192.168.0.22:9000");

gateway/src/main/resources/application-dev.yml

@@ -18,7 +18,7 @@ spring:
         - id: auth_route
           uri: http://localhost:8081/
           predicates:
-            - Path=/auth/**
+            - Path=/auth/**,/send/sendSmsCode,/appAuth/**
 
         - id: platform_route
           uri: http://localhost:8083/
@@ -30,4 +30,7 @@ spring:
           predicates:
             - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/scheme/**,/schemeRules/**,/schemeRulesAttrLink/**,/schemeRulesAttr/**,/schemeRulesDictLable/**,/schemeRulesUndwrt/**,/schemeRulesUndwrtAttrLink/**,/schemeRulesUndwrtAttr/**,/schemeRulesUndwrtDictLable/**,/schemeRulesUndwrtRules/**,/schemeRulesUndwrtRulesAttrLink/**,/schemeRules,/ptlAgreementCost/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**
 
-
+        - id: summary_route
+          uri: http://localhost:9898/
+          predicates:
+            - Path= /order/identify/** ,/supplementOrder/**

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/IdentifyController.java

@@ -4,6 +4,7 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.vo.BusinessLicense;
 import com.jzg.quotation.summary.service.IdentifyService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,8 +14,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.Map;
 
-;
-
+@Tag(name = "证件识别")
 @RestController
 @RequestMapping("/order/identify")
 @Slf4j

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsTaskImagesController.java

@@ -0,0 +1,41 @@
+package com.jzg.quotation.summary.controller;
+
+
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.InsTaskImagesAdd;
+import com.jzg.quotation.summary.service.InsTaskImagesService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotBlank;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Tag(name = "订单影像资料上传")
+@RestController
+@RequestMapping("/order/taskImages")
+public class InsTaskImagesController {
+
+    private final InsTaskImagesService insTaskImagesService;
+
+    public InsTaskImagesController(InsTaskImagesService insTaskImagesService) {
+        this.insTaskImagesService = insTaskImagesService;
+    }
+
+
+    @Operation(summary = "订单影像资料上传")
+    @PostMapping("/save")
+    public HttpResult saveOrUpdate(@RequestBody List<InsTaskImagesAdd> imagesAdds) {
+        return insTaskImagesService.save(imagesAdds);
+    }
+
+
+
+    @GetMapping("selectByQuoteNo")
+    @Operation(summary = "根据报价单号查询影像资料")
+    public HttpResult selectByQuoteNo(@NotBlank(message = "报价单号不能为空") @RequestParam("quoteNo") String quoteNo) {
+        return HttpResult.ok(insTaskImagesService.selectByQuoteNo(quoteNo));
+    }
+
+
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -1,23 +1,18 @@
 package com.jzg.quotation.summary.factory;
 
-import com.jzg.commons.constants.CompanyConstants;
-import com.jzg.quotation.commons.service.QuotationApiBaseService;
-import com.jzg.quotation.summary.factory.decorator.QuoteRestrictDecorator;
-import com.jzg.quotation.yongcheng.api.service.impl.YongChengApiRequestImpl;
-
 /**
  * 保司工厂类
  */
 public class CompanyFactory {
 
-    public static QuotationApiBaseService getQuoteService(String companyCode){
-        QuotationApiBaseService quoteService = null;
-        //永诚
-        if(CompanyConstants.AICS.getCompanyCode().equals(companyCode)){
-            quoteService = new YongChengApiRequestImpl();
-        }
-        //返回报价限制增强装饰器
-        return new QuoteRestrictDecorator(quoteService);
-    }
+//    public static QuotationApiBaseService getQuoteService(String companyCode){
+//        QuotationApiBaseService quoteService = null;
+//        //永诚
+//        if(CompanyConstants.AICS.getCompanyCode().equals(companyCode)){
+//            quoteService = new YongChengApiRequestImpl();
+//        }
+//        //返回报价限制增强装饰器
+//        return new QuoteRestrictDecorator(quoteService);
+//    }
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersExternalFeeMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.quotation.summary.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InsOrdersExternalFeeMapper extends BaseMapper<InsOrdersExternalFee> {
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersExternalPolicyMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.quotation.summary.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InsOrdersExternalPolicyMapper extends BaseMapper<InsOrdersExternalPolicy> {
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersMapper.java

@@ -2,19 +2,21 @@ package com.jzg.quotation.summary.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.vo.InsOrdersVo;
+import com.jzg.commons.entity.vo.OrdersListVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface InsOrdersMapper extends BaseMapper<InsOrders> {
 
 
-    void pageList(InsOrdersParam insOrdersParam);
-
-
     InsOrdersVo selectById(Long id);
 
 
+    IPage<OrdersListVo> pageList(@Param("page") Page page, @Param("insOrdersParam") InsOrdersParam insOrdersParam);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsTaskImagesMapper.java

@@ -0,0 +1,20 @@
+package com.jzg.quotation.summary.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.InsTaskImages;
+import com.jzg.commons.entity.vo.InsTaskImagesVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface InsTaskImagesMapper extends BaseMapper<InsTaskImages> {
+
+
+
+    @Select("SELECT t.id, t.quote_no, t.image_type, t.image_id, f.file_name, f.file_type, f.bucket_name FROM ins_task_images t LEFT JOIN sys_upload_files f ON f.id = t.image_id where t.quote_no = #{quoteNo}")
+    List<InsTaskImagesVo> selectByQuoteNo(String quoteNo);
+
+
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersExternalFeeService.java

@@ -0,0 +1,7 @@
+package com.jzg.quotation.summary.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
+
+public interface InsOrdersExternalFeeService extends IService<InsOrdersExternalFee> {
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersExternalPolicyService.java

@@ -0,0 +1,7 @@
+package com.jzg.quotation.summary.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
+
+public interface InsOrdersExternalPolicyService extends IService<InsOrdersExternalPolicy> {
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -1,13 +1,13 @@
 package com.jzg.quotation.summary.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.InsOrdersAdd;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.dto.InsOrdersAdd;
 import com.jzg.commons.entity.vo.InsOrdersVo;
-
-import java.util.List;
+import com.jzg.commons.entity.vo.OrdersListVo;
 
 public interface InsOrdersService extends IService<InsOrders> {
 
@@ -15,7 +15,7 @@ public interface InsOrdersService extends IService<InsOrders> {
     HttpResult saveOrders(InsOrdersAdd ordersAdd);
 
 
-    List<InsOrders> pageList(InsOrdersParam insOrdersParam);
+    IPage<OrdersListVo> pageList(InsOrdersParam insOrdersParam);
 
 
     InsOrdersVo selectById(Long id);

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsTaskImagesService.java

@@ -0,0 +1,19 @@
+package com.jzg.quotation.summary.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.InsTaskImagesAdd;
+import com.jzg.commons.entity.po.InsTaskImages;
+import com.jzg.commons.entity.vo.InsTaskImagesVo;
+
+import java.util.List;
+
+public interface InsTaskImagesService extends IService<InsTaskImages> {
+
+
+    HttpResult save(List<InsTaskImagesAdd> insTaskImagesAddList);
+
+    List<InsTaskImagesVo> selectByQuoteNo(String quoteNo);
+
+
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersExternalFeeServiceImpl.java

@@ -0,0 +1,11 @@
+package com.jzg.quotation.summary.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
+import com.jzg.quotation.summary.mapper.InsOrdersExternalFeeMapper;
+import com.jzg.quotation.summary.service.InsOrdersExternalFeeService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InsOrdersExternalFeeServiceImpl extends ServiceImpl<InsOrdersExternalFeeMapper, InsOrdersExternalFee> implements InsOrdersExternalFeeService {
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersExternalPolicyServiceImpl.java

@@ -0,0 +1,11 @@
+package com.jzg.quotation.summary.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
+import com.jzg.quotation.summary.mapper.InsOrdersExternalPolicyMapper;
+import com.jzg.quotation.summary.service.InsOrdersExternalPolicyService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class InsOrdersExternalPolicyServiceImpl extends ServiceImpl<InsOrdersExternalPolicyMapper, InsOrdersExternalPolicy> implements InsOrdersExternalPolicyService {
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1,12 +1,14 @@
 package com.jzg.quotation.summary.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.InsOrdersParam;
-import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.dto.InsOrdersAdd;
+import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.dto.InsuranceInfo;
+import com.jzg.commons.entity.orders.po.*;
 import com.jzg.commons.entity.vo.InsOrdersVo;
+import com.jzg.commons.entity.vo.OrdersListVo;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.mapper.InsOrdersMapper;
 import com.jzg.quotation.summary.service.*;
@@ -93,9 +95,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 保险信息
             InsuranceInfo insuranceInfo = ordersAdd.getInsuranceInfo();
             // 保险种类信息
-            InsOrdersKind insOrdersKind = insuranceInfo.getInsOrdersKind();
-            insOrdersKind.setOrderNo(quoteNo);
-            insOrdersKindService.save(insOrdersKind);
+            List<InsOrdersKind> insOrdersKindList = insuranceInfo.getInsOrdersKindList();
+            for (InsOrdersKind insOrdersKind : insOrdersKindList) {
+                insOrdersKind.setOrderNo(quoteNo);
+            }
+            insOrdersKindService.saveBatch(insOrdersKindList);
 
             // 税费信息
             InsOrdersTax insOrdersTax = insuranceInfo.getInsOrdersTax();
@@ -103,9 +107,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersTaxService.save(insOrdersTax);
 
             // 风险信息
-            InsOrdersRisk insOrdersRisk = insuranceInfo.getInsOrdersRisk();
-            insOrdersRisk.setOrderNo(quoteNo);
-            insOrdersRiskService.save(insOrdersRisk);
+            List<InsOrdersRisk> insOrdersRiskList = insuranceInfo.getInsOrdersRiskList();
+            for (InsOrdersRisk insOrdersRisk : insOrdersRiskList) {
+                insOrdersRisk.setOrderNo(quoteNo);
+            }
+            insOrdersRiskService.saveBatch(insOrdersRiskList);
 
             // 返回成功信息，表示订单、车辆和用户信息保存成功
             return HttpResult.ok("保存成功");
@@ -120,14 +126,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public HttpResult updateOrders(InsOrdersAdd ordersAdd) {
+
         return null;
     }
 
 
     @Override
-    public List<InsOrders> pageList(InsOrdersParam insOrdersParam) {
-        insOrdersMapper.pageList(insOrdersParam);
-        return List.of();
+    public IPage<OrdersListVo> pageList(InsOrdersParam insOrdersParam) {
+        IPage<OrdersListVo> ordersListVoIPage = insOrdersMapper.pageList(insOrdersParam.getPage(), insOrdersParam);
+        return ordersListVoIPage;
     }
 
     @Override

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsTaskImagesServiceImpl.java

@@ -0,0 +1,45 @@
+package com.jzg.quotation.summary.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.InsTaskImagesAdd;
+import com.jzg.commons.entity.po.InsTaskImages;
+import com.jzg.commons.entity.vo.InsTaskImagesVo;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.MinioUtils;
+import com.jzg.quotation.summary.mapper.InsTaskImagesMapper;
+import com.jzg.quotation.summary.service.InsTaskImagesService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class  InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, InsTaskImages> implements InsTaskImagesService {
+
+
+    @Override
+    public HttpResult save(List<InsTaskImagesAdd> insTaskImagesAddList) {
+        try {
+            baseMapper.insert(BeanUtil.copyToList(insTaskImagesAddList, InsTaskImages.class));
+            return HttpResult.ok("保存成功");
+        }catch (Exception e){
+            return HttpResult.error("保存失败");
+        }
+    }
+
+    @Override
+    public List<InsTaskImagesVo> selectByQuoteNo(String quoteNo) {
+       try {
+           List<InsTaskImagesVo> insTaskImagesVos = baseMapper.selectByQuoteNo(quoteNo);
+           for (InsTaskImagesVo insTaskImagesVo : insTaskImagesVos) {
+               insTaskImagesVo.setPreviewUrl(MinioUtils.getPresignedObjectUrl(insTaskImagesVo.getBucketName(), insTaskImagesVo.getFileName()));
+           }
+           return insTaskImagesVos;
+       }catch (Exception e){
+           throw new SystemException("查询失败");
+       }
+    }
+
+
+}

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -106,6 +106,7 @@
     <resultMap id="InsOrdersOtherMap" type="com.jzg.commons.entity.orders.po.InsOrdersOther">
         <id property="orderNo" column="order_no" jdbcType="VARCHAR"/>
         <result property="jqScope" column="jq_scope" jdbcType="VARCHAR"/>
+        <result property="scope" column="scope" jdbcType="VARCHAR"/>
         <result property="syScope" column="sy_scope" jdbcType="VARCHAR"/>
         <result property="lossRation" column="loss_ration" jdbcType="VARCHAR"/>
         <result property="jqLossRation" column="jq_loss_ration" jdbcType="VARCHAR"/>
@@ -156,53 +157,82 @@
     <resultMap id="InsOrdersVoMap" type="com.jzg.commons.entity.vo.InsOrdersVo">
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="quoteNo" column="quote_no" jdbcType="VARCHAR"/>
+        <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+        <result property="auditStatus" column="audit_status" jdbcType="VARCHAR"/>
+        <result property="auditComments" column="audit_comments" jdbcType="VARCHAR"/>
+        <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+        <result property="auditId" column="audit_id" jdbcType="VARCHAR"/>
+        <result property="auditName" column="audit_name" jdbcType="VARCHAR"/>
         <association property="insOrders" column="{id=id}" select="selectOrdersById" />
         <association property="carInfoVo" column="{orderNo  = quote_no}" select="selectOrdersCarInfoByOrderNo" />
         <association property="insOrdersOther" column="{orderNo  = quote_no}" select="selectOrdersOtherByOrderNo" />
         <association property="insuranceInfo"  javaType="com.jzg.commons.entity.dto.InsuranceInfo" >
-            <association property="insOrdersKind" column="{orderNo  = quote_no}" select="selectOrdersKind" />
             <association property="insOrdersTax"  column="{orderNo  = quote_no}" select="selectOrdersTax" />
-            <association property="insOrdersRisk"  column="{orderNo  = quote_no}" select="selectOrdersRisk" />
+            <collection property="insOrdersKindList" column="{orderNo  = quote_no}" select="selectOrdersKind" />
+            <collection property="insOrdersRiskList"  column="{orderNo  = quote_no}" select="selectOrdersRisk" />
         </association>
         <collection property="carUserInfoList"  column="{orderNo  = quote_no}"  select="selectCarUserInfo" />
     </resultMap>
 
 
     <select id="selectOrdersRisk" resultMap="InsOrdersRiskMap">
-        select  * from  ins_orders_risk where order_no = #{orderNo}
+        select order_no,risk_name,amount,commission_rate,premium,risk_code,no_tax_premium,commission_amount,start_date,end_date from  ins_orders_risk where order_no = #{orderNo}
     </select>
 
     <select id="selectOrdersTax" resultMap="InsOrdersTaxMap">
-        select  * from  ins_orders_tax where order_no = #{orderNo}
+        select order_no,extend_char2,tax_relief,relif_reason,tax_com_code,tax_com_name,tax_document_date,tax_paid_area_code,paid_free_certificate,taxpayer_name,taxpayer_identifier,identify_number,tax_relif_flag from  ins_orders_tax where order_no = #{orderNo}
     </select>
 
     <select id="selectOrdersKind" resultMap="OrdersKindMap">
-        select  * from  ins_orders_kind where order_no = #{orderNo}
+        select order_no,amount,kind_code,service_times,kind_name,unit_amount,deductible_rate from  ins_orders_kind where order_no = #{orderNo}
     </select>
 
 
-    <select id="pageList" resultMap="InsOrdersMap">
+    <select id="pageList" resultType="com.jzg.commons.entity.vo.OrdersListVo">
+        SELECT
+            o.quote_no,
+            o.audit_id,
+            o.audit_name,
+            o.company_name,
+            o.create_by,
+            o.create_time,
+            c.license_no,
+            s.jq_premium,
+            s.sy_premium,
+            s.jy_premium,
+            s.sum_premium,
+            s.tax_premium
+        FROM
+            ins_orders o
+                LEFT JOIN ins_orders_car_info c ON c.order_no = o.quote_no
+                LEFT JOIN ins_orders_costs s ON o.quote_no = s.order_no
     </select>
 
     <select id="selectOrdersById" resultMap="InsOrdersMap">
-        select * from  ins_orders where id = #{id}
+        select id,quote_no,agreement_id,api_type,order_status,company_id,company_name,product_id,product_name,entry_status,order_source,audit_id,
+                audit_name,audit_time,audit_opinion,pay_time,pay_link,ins_order_no,signing_time,is_temporarily
+        from  ins_orders where id = #{id}
     </select>
 
     <select id="selectCarUserInfo" resultMap="carUserInfoMap">
-        select * from ins_orders_car_user_info  where order_no = #{orderNo}
+        select order_no,policy_person_type,person_type,cer_type,`name`,identify_number,age,gender,province_code,city_code,county_code,addr,identify_valid_date,identify_valid_end_date,
+        mobile,landline,contact,contact_identify_number,contact_identify_valid_date,contact_identify_valid_end_date,email
+        from ins_orders_car_user_info  where order_no = #{orderNo}
     </select>
     
     <select id="selectOrdersCarInfoByOrderNo" resultMap="carInfoMap">
-        select * from ins_orders_car_info where order_no = #{orderNo}
+        select order_no,license_no,is_registered,vin_no,brand_name,engine_no,car_year,seat_count,complete_kerb_mass,limit_load,power_scale,purchase_price,car_nature_code,vehicle_use_code,car_type_code,car_kind_code,
+        energy_type_code,property_code,license_color_code,car_kind_detail_id_code,license_kind_code,register_date,issue_date,transfer_date,transfer
+        from ins_orders_car_info where order_no = #{orderNo}
     </select>
 
 
     <select id="selectOrdersOtherByOrderNo" resultMap="InsOrdersOtherMap">
-        select * from ins_orders_other where order_no = #{orderNo}
+        select order_no,scope,jq_scope,sy_scope,loss_ration,jq_loss_ration,sy_loss_ration,jq_renewal,sy_renewal,jq_claims,sy_claims,is_djq,jq_adjust_rate,sy_adjust_rate,tp_color_score from ins_orders_other where order_no = #{orderNo}
     </select>
     
     <select id="selectById" resultMap="InsOrdersVoMap">
-        select id, quote_no from ins_orders where id = #{id}
+        select id, quote_no,company_name,audit_status,audit_comments,create_by,audit_id,audit_name from ins_orders where id = #{id}
     </select>
 
 

tenant/insurance/quotation-yongcheng/pom.xml

@@ -29,5 +29,15 @@
     </dependencies>
     <build>
         <finalName>quotation-yongcheng</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 </project>

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/response/CoreModelsResponse.java

@@ -30,16 +30,4 @@ public class CoreModelsResponse {
 
     private String purchasePrice;
 
-    public CoreModelsResponse() {
-    }
-
-    public CoreModelsResponse(String modelCode, String modelName, String seatCount, String carYear, String power, String enginedesc, String purchasePrice) {
-        this.modelCode = modelCode;
-        this.modelName = modelName;
-        this.seatCount = seatCount;
-        this.carYear = carYear;
-        this.power = power;
-        this.enginedesc = enginedesc;
-        this.purchasePrice = purchasePrice;
-    }
 }

tenant/organization/src/main/java/com/jzg/organization/controller/DictController.java

@@ -1,21 +1,19 @@
 package com.jzg.organization.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jzg.commons.config.DictEnumConfig;
+import com.jzg.commons.constants.DictionaryManagement;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.SysDict;
-import com.jzg.commons.entity.po.SysDictType;
 import com.jzg.organization.mapper.SysDictMapper;
 import com.jzg.organization.mapper.SysDictTypeMapper;
 import io.swagger.v3.oas.annotations.Operation;
-import org.redisson.Redisson;
 import org.redisson.api.RList;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import static com.jzg.commons.constants.RedisKeyConstants.DICT_REDIS_KEY;
 
@@ -41,4 +39,13 @@ public class DictController {
         RList<SysDict> list = redissonClient.getList(DICT_REDIS_KEY + dictCode);
         return HttpResult.ok(list);
     }
+
+
+    @GetMapping(value = "/dictDetails")
+    @Operation(summary = "获取字典详情列表")
+    public HttpResult<DictionaryManagement> dictDetails(@RequestParam("type") String type) {
+        return HttpResult.ok(DictEnumConfig.getDmMap().get(type));
+    }
+
+
 }