"feature-zhaJi:新增结算信息作废类及操作层代码"

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceSettleCancel.java

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 结算信息作废记录表（用于记录项目变更导致推信息送至EKP）
+ * @TableName t_insurance_settle_cancel
+ */
+public class TInsuranceSettleCancel implements Serializable {
+    /**
+     * 
+     */
+    private String id;
+
+    /**
+     * 结算明细id
+     */
+    private String insDetailId;
+
+    /**
+     * 结算信息表id
+     */
+    private String settleId;
+
+    /**
+     * 项目编码
+     */
+    private String deptNo;
+
+    /**
+     * 项目名称
+     */
+    private String deptName;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 推送标识 1成功 0失败
+     */
+    private Integer isCancelPush;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 操作人
+     */
+    private String createUesr;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 结算明细id
+     */
+    public String getInsDetailId() {
+        return insDetailId;
+    }
+
+    /**
+     * 结算明细id
+     */
+    public void setInsDetailId(String insDetailId) {
+        this.insDetailId = insDetailId;
+    }
+
+    /**
+     * 结算信息表id
+     */
+    public String getSettleId() {
+        return settleId;
+    }
+
+    /**
+     * 结算信息表id
+     */
+    public void setSettleId(String settleId) {
+        this.settleId = settleId;
+    }
+
+    /**
+     * 项目编码
+     */
+    public String getDeptNo() {
+        return deptNo;
+    }
+
+    /**
+     * 项目编码
+     */
+    public void setDeptNo(String deptNo) {
+        this.deptNo = deptNo;
+    }
+
+    /**
+     * 项目名称
+     */
+    public String getDeptName() {
+        return deptName;
+    }
+
+    /**
+     * 项目名称
+     */
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    /**
+     * 订单编号
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * 订单编号
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * 推送标识 1成功 0失败
+     */
+    public Integer getIsCancelPush() {
+        return isCancelPush;
+    }
+
+    /**
+     * 推送标识 1成功 0失败
+     */
+    public void setIsCancelPush(Integer isCancelPush) {
+        this.isCancelPush = isCancelPush;
+    }
+
+    /**
+     * 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 操作人
+     */
+    public String getCreateUesr() {
+        return createUesr;
+    }
+
+    /**
+     * 操作人
+     */
+    public void setCreateUesr(String createUesr) {
+        this.createUesr = createUesr;
+    }
+}
\ No newline at end of file

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceSettleCancelMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_settle_cancel(结算信息作废记录表（用于记录项目变更导致推信息送至EKP）)】的数据库操作Mapper
+* @createDate 2022-08-01 11:37:54
+* @Entity generator.domain.TInsuranceSettleCancel
+*/
+@Mapper
+public interface TInsuranceSettleCancelMapper extends BaseMapper<TInsuranceSettleCancel> {
+
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceSettleCancelService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_settle_cancel(结算信息作废记录表（用于记录项目变更导致推信息送至EKP）)】的数据库操作Service
+* @createDate 2022-08-01 11:37:54
+*/
+public interface TInsuranceSettleCancelService extends IService<TInsuranceSettleCancel> {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceCompanyServiceImpl.java

@@ -124,7 +124,7 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 		String companyName = one.getCompanyName();
 		String newCompanyName = insuranceCompany.getCompanyName();
 		if (!ValidityUtil.validate60(newCompanyName)){
-			return R.failed("要修改的保险公司名称过长");
+			return R.failed("要修改的保险公司名称格式不正确");
 		}
 		//如果当前保险公司名称和修改后的名称不同
 		if (!companyName.equals(insuranceCompany.getCompanyName())){
@@ -139,9 +139,11 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 				//校验新的保险公司名称在数据库中是否存在
 				boolean b = companyIsExists(insuranceCompany.getCompanyName());
 				if(b){
-					return R.failed("当前保险公司名称已存在");
+					return R.failed("保险公司名称不能重复");
 				}else {
-					return R.ok(updateById(insuranceCompany));
+					updateById(insuranceCompany);
+					addOperate(insuranceCompany,user, InsurancesConstants.NEW_INSURANCE_COMPANY);
+					return R.ok("修改保险信息公司成功");
 				}
 			}
 		}else{

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceSettleCancelServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleCancelMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceSettleCancelService;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_settle_cancel(结算信息作废记录表（用于记录项目变更导致推信息送至EKP）)】的数据库操作Service实现
+* @createDate 2022-08-01 11:37:54
+*/
+@Service
+public class TInsuranceSettleCancelServiceImpl extends ServiceImpl<TInsuranceSettleCancelMapper, TInsuranceSettleCancel>
+implements TInsuranceSettleCancelService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceSettleCancelMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleCancelMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="insDetailId" column="INS_DETAIL_ID" jdbcType="VARCHAR"/>
+            <result property="settleId" column="SETTLE_ID" jdbcType="VARCHAR"/>
+            <result property="deptNo" column="DEPT_NO" jdbcType="VARCHAR"/>
+            <result property="deptName" column="DEPT_NAME" jdbcType="VARCHAR"/>
+            <result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
+            <result property="isCancelPush" column="IS_CANCEL_PUSH" jdbcType="TINYINT"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="createUesr" column="CREATE_UESR" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INS_DETAIL_ID,SETTLE_ID,
+        DEPT_NO,DEPT_NAME,ORDER_NO,
+        IS_CANCEL_PUSH,CREATE_TIME,CREATE_UESR
+    </sql>
+</mapper>