Commit f9ac56be authored by lixuan's avatar lixuan

feat: 新增字段

parent 141c2078
Pipeline #146675 failed with stages
in 0 seconds
......@@ -3,6 +3,7 @@ package com.ruoyi.system.domain.house;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class BusinessEntityInfo implements Serializable {
......@@ -31,5 +32,11 @@ public class BusinessEntityInfo implements Serializable {
private Boolean registrationPlaceFlag;
private Boolean backPayFlag;
private Date investigationDate;
private String note;
private boolean associationBusinessEntityFlag;
}
......@@ -3,6 +3,7 @@ package com.ruoyi.system.domain.house.vo;
import com.ruoyi.system.domain.house.BusinessEntitySell;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
......@@ -36,6 +37,12 @@ public class BusinessEntityDto {
private boolean associationBusinessEntityFlag;
private Boolean backPayFlag;
private Date investigationDate;
private String note;
private List<HouseResourcePage> houseResources;
private List<BusinessEntitySell> businessEntitySells;
......
......@@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
......@@ -78,6 +79,15 @@ public class HouseResourceExport {
@Excel(name = "备注")
private String remark;
@Excel(name = "有无欠薪", readConverterExp = "false=无,true=有")
private Boolean backPayFlag;
@Excel(name = "排查时间", dateFormat = "yyyy-MM-dd")
private Date investigationDate;
@Excel(name = "备注")
private String note;
@Excel(name = "2024营收")
private BigDecimal YearSell2024;
......
......@@ -15,15 +15,18 @@
<result property="gs" column="gs" jdbcType="BIT"/>
<result property="registrationPlaceFlag" column="registration_place_flag" jdbcType="INTEGER"/>
<result property="associationBusinessEntityFlag" column="association_business_entity_flag" jdbcType="INTEGER"/>
<result property="backPayFlag" column="back_pay_flag" jdbcType="INTEGER"/>
<result property="investigationDate" column="investigation_date" jdbcType="DATE"/>
<result property="note" column="note" jdbcType="LONGVARCHAR"/>
</resultMap>
<insert id="insertBusinessEntityInfo" parameterType="com.ruoyi.system.domain.house.BusinessEntityInfo">
INSERT INTO business_entity_info (
id, name, nature, social_credit_code,
principal, principal_tel, business, worker_number, registered_address, industry_classification, gs, registration_place_flag, association_business_entity_flag
principal, principal_tel, business, worker_number, registered_address, industry_classification, gs, registration_place_flag, association_business_entity_flag, back_pay_flag, investigation_date, note
) VALUES (
#{id}, #{name}, #{nature}, #{socialCreditCode},
#{principal}, #{principalTel}, #{business}, #{workerNumber}, #{registeredAddress}, #{industryClassification}, #{gs}, #{registrationPlaceFlag}, #{associationBusinessEntityFlag}
#{principal}, #{principalTel}, #{business}, #{workerNumber}, #{registeredAddress}, #{industryClassification}, #{gs}, #{registrationPlaceFlag}, #{associationBusinessEntityFlag}, #{backPayFlag}, #{investigationDate}, #{note}
)
</insert>
......@@ -46,6 +49,9 @@
<if test="gs != null">gs=#{gs},</if>
<if test="registrationPlaceFlag != null">registration_place_flag=#{registrationPlaceFlag},</if>
<if test="associationBusinessEntityFlag != null">association_business_entity_flag=#{associationBusinessEntityFlag},</if>
<if test="backPayFlag != null">back_pay_flag=#{backPayFlag},</if>
<if test="investigationDate != null">investigation_date=#{investigationDate},</if>
<if test="note != null">note=#{note},</if>
</set>
WHERE id=#{id}
</update>
......
......@@ -642,6 +642,9 @@
t4.registered_address,
t4.industry_classification,
t4.gs,
t4.back_pay_flag,
t4.investigation_date,
t4.note,
t1.remark,
t4.name AS businessEntityInfoName,
t4.principal,
......@@ -809,6 +812,9 @@
t4.business,
t4.worker_number,
t4.registration_place_flag,
t4.back_pay_flag,
t4.investigation_date,
t4.note,
t4.registered_address,
t4.industry_classification,
t4.gs,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment