fix 新增报告增加字段

ruoyi-admin/src/main/resources/application-prod.yml

@@ -129,7 +129,7 @@ ruoyi:
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   #线上地址
-  staticIp: http://118.31.23.65:5001/prod-api
+  staticIp: https://jyzx.qs163.cn/prod-api
 
 # 日志配置
 logging:

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/ColumnNews.java

@@ -76,7 +76,7 @@ public class ColumnNews extends BaseEntity
     @Excel(name = "原因")
     private String reason;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date releaseTime;
 
     public static long getSerialVersionUID() {

ruoyi-system/src/main/java/com/ruoyi/system/domain/InspectInfor.java

@@ -5,6 +5,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Size;
+
 /**
  * 送检信息对象 inspect_infor
  * 
@@ -37,6 +40,30 @@ public class InspectInfor extends BaseEntity
     /** 提供方式 */
     @Excel(name = "提供方式")
     private String provideType;
+    /**
+     * 取报告方式
+     */
+    private String takeReportType;
+    /**
+     * 收件人姓名
+     */
+    @Size(min = 0, max = 250, message = "长度不能超过250个字符")
+    private String takeName;
+    /**
+     * 收件人手机号
+     */
+    @Size(min = 0, max = 250, message = "长度不能超过250个字符")
+    private String takePhone;
+    /**
+     * 收件人地址
+     */
+    @Size(min = 0, max = 250, message = "长度不能超过250个字符")
+    private String takeAddress;
+    /**
+     * 样品处理方式
+     */
+    private String handleType;
+
 
     /** 送检单位名称 */
     @Excel(name = "生产单位名称")
@@ -63,6 +90,50 @@ public class InspectInfor extends BaseEntity
     @Excel(name = "是否删除", readConverterExp = "N=正常,Y=删除")
     private String isDel;
 
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getTakeReportType() {
+        return takeReportType;
+    }
+
+    public void setTakeReportType(String takeReportType) {
+        this.takeReportType = takeReportType;
+    }
+
+    public String getTakeName() {
+        return takeName;
+    }
+
+    public void setTakeName(String takeName) {
+        this.takeName = takeName;
+    }
+
+    public String getTakePhone() {
+        return takePhone;
+    }
+
+    public void setTakePhone(String takePhone) {
+        this.takePhone = takePhone;
+    }
+
+    public String getTakeAddress() {
+        return takeAddress;
+    }
+
+    public void setTakeAddress(String takeAddress) {
+        this.takeAddress = takeAddress;
+    }
+
+    public String getHandleType() {
+        return handleType;
+    }
+
+    public void setHandleType(String handleType) {
+        this.handleType = handleType;
+    }
+
     public String getIsReport() {
         return isReport;
     }

ruoyi-system/src/main/resources/mapper/system/InspectInforMapper.xml

@@ -10,6 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sampleNum"    column="sample_num"    />
         <result property="normsModel"    column="norms_model"    />
         <result property="testItems"    column="test_items"    />
+        <result property="takeReportType"    column="take_report_type"    />
+        <result property="takeName"    column="take_name"    />
+        <result property="takePhone"    column="take_phone"    />
+        <result property="takeAddress"    column="take_address"    />
+        <result property="handleType"    column="handle_type"    />
         <result property="provideType"    column="provide_type"    />
         <result property="manufacturerName"    column="manufacturer_name"    />
         <result property="manufacturerPhone"    column="manufacturer_phone"    />
@@ -25,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectInspectInforVo">
-        select inspect_id, sample_name, sample_num, norms_model, test_items, provide_type, manufacturer_name, manufacturer_phone, inspected_name, inspected_phone,is_report, is_del, create_by, create_time, update_by, update_time, remark from inspect_infor
+        select inspect_id, sample_name, sample_num, norms_model, test_items,take_report_type,take_name,take_phone,take_address,handle_type, provide_type, manufacturer_name, manufacturer_phone, inspected_name, inspected_phone,is_report, is_del, create_by, create_time, update_by, update_time, remark from inspect_infor
     </sql>
 
     <select id="selectInspectInforList" parameterType="InspectInfor" resultMap="InspectInforResult">
@@ -58,6 +63,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sampleNum != null">sample_num,</if>
             <if test="normsModel != null">norms_model,</if>
             <if test="testItems != null">test_items,</if>
+            <if test="takeReportType != null">take_report_type,</if>
+            <if test="takeName != null">take_name,</if>
+            <if test="takePhone != null">take_phone,</if>
+            <if test="takeAddress != null">take_address,</if>
+            <if test="handleType != null">handle_type,</if>
             <if test="provideType != null">provide_type,</if>
             <if test="manufacturerName != null">manufacturer_name,</if>
             <if test="manufacturerPhone != null">manufacturer_phone,</if>
@@ -76,6 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sampleNum != null">#{sampleNum},</if>
             <if test="normsModel != null">#{normsModel},</if>
             <if test="testItems != null">#{testItems},</if>
+            <if test="takeReportType != null">#{takeReportType},</if>
+            <if test="takeName != null">#{takeName},</if>
+            <if test="takePhone != null">#{takePhone},</if>
+            <if test="takeAddress != null">#{takeAddress},</if>
+            <if test="handleType != null">#{handleType},</if>
             <if test="provideType != null">#{provideType},</if>
             <if test="manufacturerName != null">#{manufacturerName},</if>
             <if test="manufacturerPhone != null">#{manufacturerPhone},</if>
@@ -98,6 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sampleNum != null">sample_num = #{sampleNum},</if>
             <if test="normsModel != null">norms_model = #{normsModel},</if>
             <if test="testItems != null">test_items = #{testItems},</if>
+            <if test="takeReportType != null">take_report_type = #{takeReportType},</if>
+            <if test="takeName != null">take_name = #{takeName},</if>
+            <if test="takePhone != null">take_phone = #{takePhone},</if>
+            <if test="takeAddress != null">take_address = #{takeAddress},</if>
+            <if test="handleType != null">handle_type = #{handleType},</if>
             <if test="provideType != null">provide_type = #{provideType},</if>
             <if test="manufacturerName != null">manufacturer_name = #{manufacturerName},</if>
             <if test="manufacturerPhone != null">manufacturer_phone = #{manufacturerPhone},</if>