1.新增删除修改 批量修改添加日志

src/main/java/com/ydtech/modules/fnc/dao/InsPlyIncomeLogMapper.java

@@ -0,0 +1,10 @@
+package com.ydtech.modules.fnc.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.fnc.entity.InsPlyIncomeLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface InsPlyIncomeLogMapper extends BaseMapper<InsPlyIncomeLog> {
+}

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -460,6 +460,12 @@ public class InsPlyIncome implements Serializable {
     @TableField(exist = false)
     private String imageUrl;
 
+
+    @ApiModelProperty("操作标识1 新增  2  修改  3 删除  ")
+    @TableField(exist = false)
+    private String operationStatus;
+
+
     public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDate createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
         this.orderno = orderno;
         this.policyno = policyno;

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncomeLog.java

@@ -0,0 +1,342 @@
+package com.ydtech.modules.fnc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@TableName("ins_ply_income_log")
+@ApiModel(value = "InsPlyIncome对象", description = "保司结算手续费")
+@NoArgsConstructor
+public class InsPlyIncomeLog {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("id")
+    @TableField("id")
+    private String id;
+
+
+    @ApiModelProperty("订单号")
+    @TableField("orderno")
+    private String orderno;
+
+    @ApiModelProperty("交强保单号")
+    @TableField("policyno")
+    private String policyno;
+
+    @ApiModelProperty("商业保单号")
+    @TableField("sy_policyno")
+    private String syPolicyno;
+
+    @ApiModelProperty("非车保单号")
+    @TableField("no_policyno")
+    private String noPolicyno;
+
+    @ApiModelProperty("结算单号")
+    @TableField(exist = false)
+    private String settleno;
+
+    @ApiModelProperty("机构")
+    @TableField("dept_id")
+    private String deptId;
+    @ApiModelProperty("机构名称")
+    @TableField(exist = false)
+    private String deptName;
+
+    @ApiModelProperty("险种")
+    @TableField("riskcode")
+    private String riskcode;
+
+    @ApiModelProperty("出单时间")
+    @TableField("pay_date")
+    private LocalDateTime payDate;
+
+    @ApiModelProperty("签单日期")
+    @TableField("signdate")
+    private LocalDateTime signDate;
+
+    @ApiModelProperty("保险公司")
+    @TableField("company_id")
+    private String companyId;
+
+    @ApiModelProperty("保险公司名称")
+    @TableField("company_name")
+    private String companyName;
+
+    @ApiModelProperty("协议号")
+    @TableField("agreement_id")
+    private String agreementId;
+
+    @ApiModelProperty("车牌号")
+    @TableField("licenseno")
+    private String licenseno;
+
+    @ApiModelProperty("车船税")
+    @TableField("taxamount")
+    private BigDecimal taxamount;
+
+    @ApiModelProperty("不含税保费")
+    @TableField("no_tax_premium")
+    private BigDecimal noTaxPremium;
+
+    @ApiModelProperty("手续费比例")
+    @TableField("commission_feerate")
+    private BigDecimal commissionFeerate;
+
+    @ApiModelProperty("其他费用比例")
+    @TableField("other_feerate")
+    private BigDecimal otherFeerate;
+
+    @ApiModelProperty("手续费金额")
+    @TableField("commission_feevalue")
+    private BigDecimal commissionFeevalue;
+
+    @ApiModelProperty("其他费用金额")
+    @TableField("other_feevalue")
+    private BigDecimal otherFeevalue;
+
+    @ApiModelProperty("总费用")
+    @TableField("all_fee_value")
+    private BigDecimal allFeeValue;
+
+    @ApiModelProperty("已结算费用")
+    @TableField("final_fee_value")
+    private BigDecimal finalFeeValue;
+
+    @ApiModelProperty("正在结算费用")
+    @TableField("doing_fee_value")
+    private BigDecimal doingFeeValue;
+
+    @ApiModelProperty("记录插入时间")
+    @TableField("create_time")
+    private LocalDate createTime;
+
+    @ApiModelProperty("开票时间")
+    @TableField("invoic_time")
+    private LocalDate invoicTime;
+
+    @ApiModelProperty("结算日期")
+    @TableField("settlement_time")
+    private LocalDate settlementTime;
+
+    @ApiModelProperty("修改日期")
+    @TableField("update_time")
+    private LocalDate updateTime;
+
+    @ApiModelProperty("结算人")
+    @TableField("settlement_user_id")
+    private String settlementUserId;
+
+    @ApiModelProperty("修改人")
+    @TableField("update_user_id")
+    private String updateUserId;
+
+    @ApiModelProperty("被保人")
+    @TableField("user_id")
+    private String userId;
+
+    @ApiModelProperty("凭证号")
+    @TableField("voucher_number")
+    private String voucherNumber;
+
+    @ApiModelProperty("合同号")
+    @TableField("contract_id")
+    private String contractId;
+
+    @ApiModelProperty("合同附件id")
+    @TableField("contract_file_id")
+    private String contractFileId;
+
+    @ApiModelProperty("手续费结算状态  1 为已结算  2 已经结算")
+    @TableField("handling_fees_status")
+    private String handlingFeesStatus;
+
+
+    @ApiModelProperty("跟单费结算状态  1 为已结算  2 已经结算")
+    @TableField("documentary_fees_status")
+    private String documentaryFeesStatus;
+
+
+    @ApiModelProperty("是否是非车")
+    @TableField("is_not_car")
+    private String isNotCar;
+
+    @ApiModelProperty("是否是跟单")
+    @TableField("is_not_documentary")
+    private String isNotDocumentary;
+
+    @ApiModelProperty("开票金额")
+    @TableField("invoic_amount")
+    private BigDecimal invoicAmount;
+
+    @ApiModelProperty("开票号")
+    @TableField("invoic_id")
+    private String invoicId;
+
+
+    @ApiModelProperty("含税保费")
+    @TableField("tax_premium")
+    private BigDecimal taxPremium;
+
+    @ApiModelProperty("交强手续费")
+    @TableField("jq_supervise_costs_premiums")
+    private BigDecimal jqSuperviseCostsPremiums;
+
+    @ApiModelProperty("交强手续费比例")
+    @TableField("jq_supervise_costs_proportion")
+    private BigDecimal jqSuperviseCostsProportion;
+
+    @ApiModelProperty("商业手续费")
+    @TableField("sy_supervise_costs_premiums")
+    private BigDecimal sySuperviseCostsPremiums;
+
+    @ApiModelProperty("商业手续费比例")
+    @TableField("sy_supervise_costs_proportion")
+    private BigDecimal sySuperviseCostsProportion;
+
+    @ApiModelProperty("非车手续费")
+    @TableField("no_supervise_costs_premiums")
+    private BigDecimal noSuperviseCostsPremiums;
+
+    @ApiModelProperty("非车手续费比例")
+    @TableField("no_supervise_costs_proportion")
+    private BigDecimal noSuperviseCostsProportion;
+
+    @ApiModelProperty("交强险含税保费")
+    @TableField("jq_premium")
+    private BigDecimal jqPremium;
+
+    @ApiModelProperty("商业险含保费")
+    @TableField("sy_premium")
+    private BigDecimal syPremium;
+
+    @ApiModelProperty("非车险含保费")
+    @TableField("no_premium")
+    private BigDecimal noPremium;
+
+    @ApiModelProperty("交强险不含税保费")
+    @TableField("jq_no_tax_premium")
+    private BigDecimal jqNoTaxPremium;
+
+
+    @ApiModelProperty("商业险不含税保费")
+    @TableField("sy_no_tax_premium")
+    private BigDecimal syNoTaxPremium;
+
+    @ApiModelProperty("非车险不含税保费")
+    @TableField("no_no_tax_premium")
+    private BigDecimal noNoTaxPremium;
+
+    @ApiModelProperty("交强应收比例")
+    @TableField("jq_receivable_proportion")
+    private BigDecimal jqReceivableProportion;
+
+    @ApiModelProperty("商业应收比例")
+    @TableField("sy_receivable_proportion")
+    private BigDecimal syReceivableProportion;
+
+
+    @ApiModelProperty("非车应收比例")
+    @TableField("no_receivable_proportion")
+    private BigDecimal noReceivableProportion;
+
+    @ApiModelProperty("应收金额")
+    @TableField("receivable_amount")
+    private BigDecimal receivableAmount;
+
+    @ApiModelProperty("交强跟单比例")
+    @TableField("jq_other_costs_proportion")
+    private BigDecimal jqOtherCostsProportion;
+
+    @ApiModelProperty("商业跟单比例")
+    @TableField("sy_other_costs_proportion")
+    private BigDecimal syOtherCostsProportion;
+
+    @ApiModelProperty("非车跟单比例")
+    @TableField("no_other_costs_proportion")
+    private BigDecimal noOtherCostsProportion;
+
+
+
+    @ApiModelProperty("交强跟单金额")
+    @TableField("jq_other_costs_premium")
+    private BigDecimal jqOtherCostsPremium;
+
+    @ApiModelProperty("商业跟单金额")
+    @TableField("sy_other_costs_premium")
+    private BigDecimal syOtherCostsPremium;
+
+    @ApiModelProperty("非车跟单金额")
+    @TableField("no_other_costs_premium")
+    private BigDecimal noOtherCostsPremium;
+
+    @ApiModelProperty("合作公司id")
+    @TableField("partner_companies_id")
+    private String partnerCompaniesId;
+
+    @ApiModelProperty("合作公司名称")
+    @TableField("partner_companies_name")
+    private String partnerCompaniesName;
+
+
+    @ApiModelProperty("被保人名称")
+    @TableField("insured_name")
+    private String insuredName;
+
+    @ApiModelProperty("备注")
+    @TableField("remarks")
+    private String remarks;
+
+    @ApiModelProperty("交强险起期")
+    @TableField("jq_start_date")
+    private String jqStartDate;
+
+    @ApiModelProperty("交强险止期")
+    @TableField("jq_end_date")
+    private String jqEndDate;
+
+    @ApiModelProperty("商业险起期")
+    @TableField("sy_start_date")
+    private String syStartDate;
+
+    @ApiModelProperty("商业险止期")
+    @TableField("sy_end_date")
+    private String syEndDate;
+
+    @ApiModelProperty("跟单结算")
+    @TableField("settle_other_status")
+    private String settleOtherStatus;
+
+    @ApiModelProperty("对账截图")
+    @TableField("settlement_image_id")
+    private String settlementImageId;
+
+    @ApiModelProperty("任务id")
+    @TableField("task_id")
+    private String taskId;
+
+    @ApiModelProperty("操作标识1 新增  2  修改  3 删除  ")
+    @TableField("operation_status")
+    private String operationStatus;
+
+    @ApiModelProperty("关联id")
+    @TableField("income_id")
+    private String incomeId;
+
+
+
+
+
+}

src/main/java/com/ydtech/modules/fnc/service/InsPlyIncomeLogService.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.fnc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.fnc.entity.InsPlyIncome;
+import com.ydtech.modules.fnc.entity.InsPlyIncomeLog;
+
+public interface InsPlyIncomeLogService  extends IService<InsPlyIncomeLog> {
+
+
+    void saveLog(InsPlyIncomeLog insPlyIncomeLog);
+}

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

@@ -0,0 +1,21 @@
+package com.ydtech.modules.fnc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.fnc.dao.InsPlyIncomeLogMapper;
+import com.ydtech.modules.fnc.entity.InsPlyIncome;
+import com.ydtech.modules.fnc.entity.InsPlyIncomeLog;
+import com.ydtech.modules.fnc.service.InsPlyIncomeLogService;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+
+@Service
+public class InsPlyIncomeLogServiceImpl extends ServiceImpl<InsPlyIncomeLogMapper, InsPlyIncomeLog> implements InsPlyIncomeLogService {
+    @Override
+    public void saveLog(InsPlyIncomeLog insPlyIncomeLog) {
+        insPlyIncomeLog.setCreateTime(LocalDate.now());
+        baseMapper.insert(insPlyIncomeLog);
+    }
+}

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

@@ -107,6 +107,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     private IncomeTaskRelationshipService incomeTaskRelationshipService;
     @Autowired
     private  SettlementDocumentaryFeesSumService settlementDocumentaryFeesSumService;
+    @Autowired
+    private  InsPlyIncomeLogService  insPlyIncomeLogService;
 
     @Value("${upload.file.path}")
     private String uploadPath;
@@ -1193,11 +1195,22 @@ handlingProportion,
 //        根据协议   如果是含增值税结算   用保费 *   如果是  不含税保费
         InsPlyIncome insPlyIncome = new InsPlyIncome();
         BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        insPlyIncome.setId(null);
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setOperationStatus("2");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
         this.amountCalculate(insPlyIncomeVo, insPlyIncome);
         insPlyIncome.setUpdateUserId(BaseController.getUser().getId());
         baseMapper.updateById(insPlyIncome);
-        insPlyIncomeVo.setCrudStatus("2");
-        this.saveLog(insPlyIncomeVo);
+
+
+//
+//        insPlyIncomeVo.setCrudStatus("2");
+//        this.saveLog(insPlyIncomeVo);
 
     }
 
@@ -1205,6 +1218,14 @@ handlingProportion,
     public void updateNoHand(InsPlyIncomeVo insPlyIncomeVo) {
         //        根据协议   如果是含增值税结算   用保费 *   如果是  不含税保费
         InsPlyIncome insPlyIncome = baseMapper.getById(insPlyIncomeVo.getId());
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        insPlyIncome.setId(null);
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setOperationStatus("2");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
         BigDecimal bigDecimal = this.getBigDecimal(insPlyIncome.getNoPremium(), insPlyIncomeVo.getNoSuperviseCostsProportion());
         insPlyIncome.setCommissionFeevalue(bigDecimal);
         insPlyIncome.setCommissionFeerate(insPlyIncomeVo.getNoSuperviseCostsProportion());
@@ -1391,6 +1412,15 @@ handlingProportion,
         LocalDateTime localDateTime = this.LocalDatePareLocalDateTime(signdateStr);
         insPlyIncomeVo.setSignDate(null);
         BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        insPlyIncome.setId(null);
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
+
         insPlyIncome.setUserId(BaseController.getUser().getId());
         insPlyIncome.setDocumentaryFeesStatus("0");
         insPlyIncome.setHandlingFeesStatus("0");
@@ -1437,9 +1467,6 @@ handlingProportion,
         }
         insPlyIncome.setAgreementId(ptlAgreement.getId());
         baseMapper.insert(insPlyIncome);
-        insPlyIncomeVo.setId(insPlyIncome.getId());
-        insPlyIncomeVo.setCrudStatus("1");
-        this.saveLog(insPlyIncomeVo);   //添加日志
 
         return HttpResult.ok();
     }
@@ -1485,6 +1512,14 @@ handlingProportion,
                }
             }
         }
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        insPlyIncome.setId(null);
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
         baseMapper.deleteById(insPlyIncomeVo.getId());   //删除 结算  然后删除结算表
         return HttpResult.ok("删除成功");
 
@@ -2520,6 +2555,7 @@ handlingProportion,
                 params.put("isNotCar", "0");
                 InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
 
+
                 if (item.getJqOtherCostsProportion() == null) {
                     item.setJqOtherCostsProportion(BigDecimal.ZERO);
                 }
@@ -2527,7 +2563,18 @@ handlingProportion,
                     item.setSyOtherCostsProportion(BigDecimal.ZERO);
                 }
 
-                if (byBxLicenseno.getJqOtherCostsProportion().compareTo(item.getJqOtherCostsProportion()) != 0 || byBxLicenseno.getSyOtherCostsProportion().compareTo(item.getSyOtherCostsProportion()) != 0) {
+                if (ObjectUtils.isNotEmpty(byBxLicenseno) && (byBxLicenseno.getJqOtherCostsProportion().compareTo(item.getJqOtherCostsProportion()) != 0 || byBxLicenseno.getSyOtherCostsProportion().compareTo(item.getSyOtherCostsProportion()) != 0)) {
+
+
+                    InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+                    insPlyIncomeLog.setIncomeId(byBxLicenseno.getId());
+                    byBxLicenseno.setId(null);
+                    BeanUtils.copyProperties(byBxLicenseno,insPlyIncomeLog);
+                    insPlyIncomeLog.setOperationStatus("2");
+                    insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
+
+
                     // 如果比例不相等
                     BigDecimal jqOtherCostsProportion = item.getJqOtherCostsProportion();
                     BigDecimal syOtherCostsProportion = item.getSyOtherCostsProportion();
@@ -2598,7 +2645,16 @@ handlingProportion,
                 params.put("isNotCar", "1");
                 params.put("isOther", "1");
                 InsPlyIncome byBxLicenseno = baseMapper.findByBxLicenseno(params);
-                if (byBxLicenseno.getNoOtherCostsProportion().compareTo(item.getNoOtherCostsProportion()) != 0) {
+                if (ObjectUtils.isNotEmpty(byBxLicenseno) && byBxLicenseno.getNoOtherCostsProportion().compareTo(item.getNoOtherCostsProportion()) != 0) {
+
+                    InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+                    insPlyIncomeLog.setIncomeId(byBxLicenseno.getId());
+                    byBxLicenseno.setId(null);
+                    BeanUtils.copyProperties(byBxLicenseno,insPlyIncomeLog);
+                    insPlyIncomeLog.setOperationStatus("2");
+                    insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
+
                     HashMap<String, Object> newMap = new HashMap<>();
 
                     // 如果比例不相等
@@ -2736,8 +2792,15 @@ handlingProportion,
         insPlyIncome.setDocumentaryFeesStatus("0");
         insPlyIncome.setAllFeeValue(insPlyIncome.getReceivableAmount());
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getSignDate())){
-            insPlyIncome.setSignDate(LocalDateTime.parse(insPlyIncomeVo.getSignDate(), formatter));
-        }
+            LocalDate signDate = LocalDate.parse(insPlyIncomeVo.getSignDate(), formatter);
+            insPlyIncome.setSignDate(signDate.atStartOfDay());
+        }
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        insPlyIncome.setId(null);
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
         baseMapper.insert(insPlyIncome);
         return HttpResult.ok();
     }