保存修改

commons/src/main/java/com/jzg/commons/entity/quote/vo/CustomerInfoVo.java

@@ -22,6 +22,9 @@ public class CustomerInfoVo implements Serializable {
     @Serial
     private static final long serialVersionUID = -6294245892491122989L;
 
+    @Schema(description = "人员类型 1 个人 2 法人")
+    private Integer personType;
+
     /**
      * 姓名
      */

commons/src/main/java/com/jzg/commons/entity/quote/vo/RiskInfoVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.quote.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,6 +24,9 @@ public class RiskInfoVo implements Serializable {
     @Serial
     private static final long serialVersionUID = -8958183565558385154L;
 
+    @Schema(description = "ID")
+    private String id;
+
     /**
      * 险种代码
      */

commons/src/main/java/com/jzg/commons/util/comparble/CompatibleUtils.java

@@ -81,8 +81,8 @@ public class CompatibleUtils {
                     CompareResult compareResult = new CompareResult();
                     compareResult.setName(SchemaAnnotationUtils.getSchemaAnnotation(entityName, key));
                     compareResult.setFieldName(key);
-                    compareResult.setFieldContent(newValue);
-                    compareResult.setNewFieldContent(oldValue);
+                    compareResult.setFieldContent(oldValue);
+                    compareResult.setNewFieldContent(newValue);
                     compareResult.setHandedType(""); // 默认值，可根据需求调整
                     results.add(compareResult);
                 }

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

@@ -3,6 +3,7 @@ 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.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
@@ -14,4 +15,6 @@ public interface InsTaskImagesMapper extends BaseMapper<InsTaskImages> {
     InsTaskImagesVo selectByQuoteNo(String quoteNo);
 
 
+    @Delete("delete from ins_task_images where quote_no = #{quoteNo}")
+    void removeByQuoteNo(String quoteNo);
 }

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

@@ -13,5 +13,6 @@ public interface InsTaskImagesService extends IService<InsTaskImages> {
 
     InsTaskImagesVo selectByQuoteNo(String quoteNo);
 
+    void removeByQuoteNo(String quoteNo);
 
 }

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

@@ -2,6 +2,7 @@ package com.jzg.quotation.summary.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -219,40 +220,47 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersOtherService.updateById(insOrdersOther);
             // 保存其他信息
             InsOrdersCosts insOrdersCosts = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersCosts.class);
-            insOrdersCosts.setOrderNo(insOrders.getQuoteNo());
-            insOrdersCostsService.updateById(insOrdersCosts);
-
+            if (ObjectUtil.isNotNull(insOrdersCosts.getJqPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSyPremium())
+            || ObjectUtil.isNotNull(insOrdersCosts.getJyPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSumPremium())
+                    || ObjectUtil.isNotNull(insOrdersCosts.getTaxPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getJqRatio())
+            || ObjectUtil.isNotNull(insOrdersCosts.getSyRatio())){
+                insOrdersCosts.setOrderNo(quoteNo);
+                insOrdersCostsService.updateById(insOrdersCosts);
+            }
             // 保险种类信息
             List<KindInfoVo> kindInfoVo = ordersEnd.getKindInfoVo();
             List<InsOrdersKind> insOrdersKinds = BeanUtil.copyToList(kindInfoVo, InsOrdersKind.class);
             insOrdersKindService.updateBatchById(insOrdersKinds);
 
             // 税费信息
-            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTax();
-            InsOrdersTax insOrdersTax = BeanUtil.copyProperties(vehicleAndVesselTax, InsOrdersTax.class);
-            insOrdersTax.setOrderNo(quoteNo);
-            insOrdersTaxService.updateById(insOrdersTax);
+//            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTax();
+//            InsOrdersTax insOrdersTax = BeanUtil.copyProperties(vehicleAndVesselTax, InsOrdersTax.class);
+//            insOrdersTax.setOrderNo(quoteNo);
+//            insOrdersTaxService.updateById(insOrdersTax);
 
             // 交强险 险种信息
-            RiskInfoVo ciRiskInfoVo = ordersEnd.getCiRiskInfoVo();
-            InsOrdersRisk insuranceInfo = BeanUtil.copyProperties(ciRiskInfoVo, InsOrdersRisk.class);
-            insOrdersRiskService.update(insuranceInfo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,quoteNo));
-            // 商业险 险种信息
-            InsOrdersRisk biRiskInfoVo = BeanUtil.copyProperties(ordersEnd.getBiRiskInfoVo(), InsOrdersRisk.class);
-            insOrdersRiskService.update(biRiskInfoVo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,quoteNo));
+//            RiskInfoVo ciRiskInfoVo = ordersEnd.getCiRiskInfoVo();
+//            InsOrdersRisk insuranceInfo = BeanUtil.copyProperties(ciRiskInfoVo, InsOrdersRisk.class);
+//            insOrdersRiskService.update(insuranceInfo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,quoteNo));
+//            // 商业险 险种信息
+//            InsOrdersRisk biRiskInfoVo = BeanUtil.copyProperties(ordersEnd.getBiRiskInfoVo(), InsOrdersRisk.class);
+//            insOrdersRiskService.update(biRiskInfoVo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,quoteNo));
 
             InsTaskImagesAdd imagesAdds = ordersEnd.getImagesAdds();
-            if (ObjectUtil.isNotEmpty(imagesAdds)){
+            if (ObjectUtil.isNotNull(imagesAdds)) {
                 List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
-                insTaskImages.forEach(image->{
-                    image.setQuoteNo(String.valueOf(quoteNo));
-                    insTaskImagesService.save(image);
-                });
-            }
+                if (CollectionUtil.isNotEmpty(insTaskImages)) {
+                    insTaskImagesService.removeByQuoteNo(quoteNo);
+                    insTaskImages.forEach(image -> {
+                        image.setQuoteNo(String.valueOf(quoteNo));
+                        insTaskImagesService.save(image);
+                    });
 
-            InsOrdersExternalPolicy ordersExternalPolicy = ordersEnd.getInsOrdersExternalPolicy();
-            ordersExternalPolicy.setOrderNo(String.valueOf(quoteNo));
-            policyService.updateById(ordersExternalPolicy);
+                }
+            }
+//            InsOrdersExternalPolicy ordersExternalPolicy = ordersEnd.getInsOrdersExternalPolicy();
+//            ordersExternalPolicy.setOrderNo(String.valueOf(quoteNo));
+//            policyService.updateById(ordersExternalPolicy);
 
 
             // 返回成功信息，表示订单、车辆和用户信息修改成功
@@ -296,10 +304,28 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 }
             });
         }
+        if (CollectionUtil.isNotEmpty(insOrdersVo.getInsOrdersRiskList())){
+            insOrdersVo.getInsOrdersRiskList().forEach(riskInfo -> {
+                if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
+                    insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
+                }else {
+                    insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
+                }
+            });
+        }
         setInsOrdersExternalPolicy(insOrdersVo.getInsOrdersExternalPolicy());
         return insOrdersVo;
     }
 
+    private RiskInfoVo getRiskInfoVo(InsOrdersRisk riskInfo) {
+        RiskInfoVo riskInfoVo = new RiskInfoVo();
+        riskInfoVo.setId(riskInfo.getId());
+        riskInfoVo.setRiskCode(riskInfo.getRiskCode());
+        riskInfoVo.setStartDate(riskInfo.getStartDate().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+        riskInfoVo.setEndDate(riskInfo.getEndDate().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+        return riskInfoVo;
+    }
+
 
     public void setInsOrdersExternalPolicy(InsOrdersExternalPolicy ordersExternalPolicy) {
         if (ObjectUtil.isNotEmpty(ordersExternalPolicy) && CollectionUtil.isNotEmpty(ordersExternalPolicy.getUploadFiles())){

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

@@ -50,5 +50,10 @@ public class  InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper,
        }
     }
 
+    @Override
+    public void removeByQuoteNo(String quoteNo) {
+        baseMapper.removeByQuoteNo(quoteNo);
+    }
+
 
 }

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

@@ -125,7 +125,8 @@
 
     <!--订单 险种-->
     <resultMap id="InsOrdersRiskMap" type="com.jzg.commons.entity.orders.po.InsOrdersRisk">
-        <id property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
         <result property="riskName" column="risk_name" jdbcType="VARCHAR"/>
         <result property="amount" column="amount" jdbcType="VARCHAR"/>
         <result property="commissionRate" column="commission_rate" jdbcType="VARCHAR"/>
@@ -277,7 +278,7 @@
     </select>
 
     <select id="selectOrdersRisk" resultMap="InsOrdersRiskMap">
-        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 id,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">
@@ -309,6 +310,7 @@
                 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
         <where>
+            o.is_delete = 0
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND o.quote_no = #{insOrdersParam.orderNo}
             </if>

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

@@ -1,5 +1,6 @@
 package com.jzg.organization.controller;
 
+import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.SysDeptParam;
@@ -22,12 +23,14 @@ public class DeptController extends BaseController {
     @Autowired
     private SysDeptService sysDeptService;
 
+    @OperatorTrajectory(moduleName = "组织架构/机构管理/添加机构",serviceTag = "sysDeptService",entity = "com.jzg.commons.entity.vo.SysDeptVo")
     @Operation(summary = "新增机构接口", description = "新增机构接口")
     @PostMapping(value = "/add")
     public HttpResult<Boolean> addDept(@RequestBody SysDeptVo sysDeptVo) {
         return sysDeptService.addDept(sysDeptVo) ? HttpResult.ok("添加机构成功") : HttpResult.error("添加机构失败");
     }
 
+    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构修改",serviceTag = "sysDeptService",entity = "com.jzg.commons.entity.vo.SysDeptVo",type = "U")
     @Operation(summary = "修改机构接口", description = "修改机构接口")
     @PostMapping(value = "/update")
     public HttpResult updateDept(@RequestBody SysDeptVo sysDeptVo) {
@@ -35,6 +38,7 @@ public class DeptController extends BaseController {
         return sysDeptService.updateDept(sysDeptVo) ? HttpResult.ok("修改成功") : HttpResult.error("修改失败");
     }
 
+    @OperatorTrajectory(moduleName = "组织架构/机构管理/机构删除",serviceTag = "sysDeptService",entity = "com.jzg.commons.entity.vo.SysDeptVo",type = "U")
     @Operation(summary = "删除机构接口", description = "删除机构接口")
     @PostMapping(value = "/delete")
     public HttpResult deleteDept(@RequestBody SysDeptVo sysDeptVo) {