捐献基础增加入院时间,捐献上报基础增加入院时间

sinake

3 天以前 4c141764d64c37c4c27e372cd55d9e861b192c28

捐献基础增加入院时间,捐献上报基础增加入院时间

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java

@@ -50,7 +50,7 @@
     */
    @ApiOperation("获取序列号")
    @GetMapping("/getSequence")
    public AjaxResult getSequence( String businessType, String orgId) {
    public AjaxResult getSequence(String businessType, String orgId) {

        return AjaxResult.success(baseOnlyvalueService.getSequence(businessType, orgId));
    }

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java

@@ -640,5 +640,8 @@
    @Excel(name = "协调员姓名", readConverterExp = "协调员姓名")
    private String coordinatorName;


    @ApiModelProperty("入院时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date  entryTime;
}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java

@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * 捐献上报基础对象 service_donatebaseinfo_report
@@ -425,5 +426,10 @@
    @Excel(name = "确认时间", readConverterExp = "确认时间")
    private Date confirmTime;

    @ApiModelProperty("入院时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date  entryTime;

}


 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml

@@ -96,6 +96,7 @@
        <result property="currentHospital" column="current_hospital"/>
        <result property="terminationType" column="termination_type"/>
        <result property="extracontent" column="extracontent"/>
        <result property="entryTime" column="entry_time"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoVo">

 ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoReportMapper.xml

@@ -63,6 +63,7 @@
        <result property="coordinatorNo" column="coordinator_no"/>
        <result property="infoName" column="info_name"/>
        <result property="infoNo" column="info_no"/>
        <result property="entryTime" column="entry_time"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoReportVo">
@@ -123,7 +124,8 @@
               user_name,
               dept_no,
               dept_name,
               is_transport
               is_transport,
               entry_time
        from service_donatebaseinfo_report
    </sql>