Compare commits

..

No commits in common. '17d555ad6d159522cbd49e7491d3aad899675860' and '1556d05f5e0afb857cc618bebff7d668578e64cd' have entirely different histories.

@ -37,6 +37,7 @@ public class THospitalController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('system:hospital:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(THospital tHospital) public TableDataInfo list(THospital tHospital)
{ {
@ -48,6 +49,7 @@ public class THospitalController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('system:hospital:export')")
@Log(title = "医院信息", businessType = BusinessType.EXPORT) @Log(title = "医院信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, THospital tHospital) public void export(HttpServletResponse response, THospital tHospital)
@ -60,6 +62,7 @@ public class THospitalController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('system:hospital:query')")
@GetMapping(value = "/{id}") @GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) public AjaxResult getInfo(@PathVariable("id") Long id)
{ {
@ -69,6 +72,7 @@ public class THospitalController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('system:hospital:add')")
@Log(title = "医院信息", businessType = BusinessType.INSERT) @Log(title = "医院信息", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody THospital tHospital) public AjaxResult add(@RequestBody THospital tHospital)
@ -79,6 +83,7 @@ public class THospitalController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('system:hospital:edit')")
@Log(title = "医院信息", businessType = BusinessType.UPDATE) @Log(title = "医院信息", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody THospital tHospital) public AjaxResult edit(@RequestBody THospital tHospital)
@ -89,6 +94,7 @@ public class THospitalController extends BaseController
/** /**
* *
*/ */
@PreAuthorize("@ss.hasPermi('system:hospital:remove')")
@Log(title = "医院信息", businessType = BusinessType.DELETE) @Log(title = "医院信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long[] ids)

@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* t_doctor * t_doctor
* *
* @author ruoyi * @author ruoyi
* @date 2022-08-04 * @date 2022-08-03
*/ */
public class TDoctor extends BaseEntity public class TDoctor extends BaseEntity
{ {
@ -66,10 +66,6 @@ public class TDoctor extends BaseEntity
@Excel(name = "职业医师照片路径") @Excel(name = "职业医师照片路径")
private String medicalLicense; private String medicalLicense;
/** 二维码base64 */
@Excel(name = "二维码base64")
private String qrCode;
/** 医院 */ /** 医院 */
@Excel(name = "医院") @Excel(name = "医院")
private Long hospitalId; private Long hospitalId;
@ -194,15 +190,6 @@ public class TDoctor extends BaseEntity
{ {
return medicalLicense; return medicalLicense;
} }
public void setQrCode(String qrCode)
{
this.qrCode = qrCode;
}
public String getQrCode()
{
return qrCode;
}
public void setHospitalId(Long hospitalId) public void setHospitalId(Long hospitalId)
{ {
this.hospitalId = hospitalId; this.hospitalId = hospitalId;
@ -238,7 +225,6 @@ public class TDoctor extends BaseEntity
.append("speciality", getSpeciality()) .append("speciality", getSpeciality())
.append("introduction", getIntroduction()) .append("introduction", getIntroduction())
.append("medicalLicense", getMedicalLicense()) .append("medicalLicense", getMedicalLicense())
.append("qrCode", getQrCode())
.append("hospitalId", getHospitalId()) .append("hospitalId", getHospitalId())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("createTime", getCreateTime()) .append("createTime", getCreateTime())

@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="speciality" column="speciality" /> <result property="speciality" column="speciality" />
<result property="introduction" column="introduction" /> <result property="introduction" column="introduction" />
<result property="medicalLicense" column="medical_license" /> <result property="medicalLicense" column="medical_license" />
<result property="qrCode" column="qr_code" />
<result property="hospitalId" column="hospital_id" /> <result property="hospitalId" column="hospital_id" />
<result property="delFlag" column="del_flag" /> <result property="delFlag" column="del_flag" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
@ -26,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTDoctorVo"> <sql id="selectTDoctorVo">
select id, open_id, user_id, identifier, name, phone, sex, age, marriage, title, speciality, introduction, medical_license, qr_code, hospital_id, del_flag, create_time, update_time from t_doctor select id, open_id, user_id, identifier, name, phone, sex, age, marriage, title, speciality, introduction, medical_license, hospital_id, del_flag, create_time, update_time from t_doctor
</sql> </sql>
<select id="selectTDoctorList" parameterType="TDoctor" resultMap="TDoctorResult"> <select id="selectTDoctorList" parameterType="TDoctor" resultMap="TDoctorResult">
@ -44,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="speciality != null and speciality != ''"> and speciality = #{speciality}</if> <if test="speciality != null and speciality != ''"> and speciality = #{speciality}</if>
<if test="introduction != null and introduction != ''"> and introduction = #{introduction}</if> <if test="introduction != null and introduction != ''"> and introduction = #{introduction}</if>
<if test="medicalLicense != null and medicalLicense != ''"> and medical_license = #{medicalLicense}</if> <if test="medicalLicense != null and medicalLicense != ''"> and medical_license = #{medicalLicense}</if>
<if test="qrCode != null and qrCode != ''"> and qr_code = #{qrCode}</if>
<if test="hospitalId != null "> and hospital_id = #{hospitalId}</if> <if test="hospitalId != null "> and hospital_id = #{hospitalId}</if>
</where> </where>
</select> </select>
@ -69,7 +67,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="speciality != null">speciality,</if> <if test="speciality != null">speciality,</if>
<if test="introduction != null">introduction,</if> <if test="introduction != null">introduction,</if>
<if test="medicalLicense != null">medical_license,</if> <if test="medicalLicense != null">medical_license,</if>
<if test="qrCode != null">qr_code,</if>
<if test="hospitalId != null">hospital_id,</if> <if test="hospitalId != null">hospital_id,</if>
<if test="delFlag != null">del_flag,</if> <if test="delFlag != null">del_flag,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -88,7 +85,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="speciality != null">#{speciality},</if> <if test="speciality != null">#{speciality},</if>
<if test="introduction != null">#{introduction},</if> <if test="introduction != null">#{introduction},</if>
<if test="medicalLicense != null">#{medicalLicense},</if> <if test="medicalLicense != null">#{medicalLicense},</if>
<if test="qrCode != null">#{qrCode},</if>
<if test="hospitalId != null">#{hospitalId},</if> <if test="hospitalId != null">#{hospitalId},</if>
<if test="delFlag != null">#{delFlag},</if> <if test="delFlag != null">#{delFlag},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -111,7 +107,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="speciality != null">speciality = #{speciality},</if> <if test="speciality != null">speciality = #{speciality},</if>
<if test="introduction != null">introduction = #{introduction},</if> <if test="introduction != null">introduction = #{introduction},</if>
<if test="medicalLicense != null">medical_license = #{medicalLicense},</if> <if test="medicalLicense != null">medical_license = #{medicalLicense},</if>
<if test="qrCode != null">qr_code = #{qrCode},</if>
<if test="hospitalId != null">hospital_id = #{hospitalId},</if> <if test="hospitalId != null">hospital_id = #{hospitalId},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if> <if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>

Loading…
Cancel
Save