diff --git a/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java b/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java index 04e5b66..07b2a65 100644 --- a/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java +++ b/src/main/java/com/glxp/udidl/admin/controller/udchs/CodeRelController.java @@ -37,8 +37,7 @@ public class CodeRelController { return ResultVOUtils.error(ResultEnum.DATA_ERROR,"参数错误"); } List<CodeRel> list = codeRelService.list(new LambdaQueryWrapper<CodeRel>() - .eq(CodeRel::getDiNameCode,param.getDiNameCode()).or().eq(CodeRel::getDrugCode,param.getDrugCode()) - .or(StrUtil.isNotBlank(param.getApprovalNum())).eq(StrUtil.isNotBlank(param.getApprovalNum()),CodeRel::getApprovalNum,param.getApprovalNum())); + .eq(CodeRel::getDiNameCode,param.getDiNameCode()).or().eq(CodeRel::getDrugCode,param.getDrugCode())); return ResultVOUtils.success(list); } diff --git a/src/main/java/com/glxp/udidl/admin/entity/chs/CodeRel.java b/src/main/java/com/glxp/udidl/admin/entity/chs/CodeRel.java index 7898825..fe8f3c7 100644 --- a/src/main/java/com/glxp/udidl/admin/entity/chs/CodeRel.java +++ b/src/main/java/com/glxp/udidl/admin/entity/chs/CodeRel.java @@ -78,10 +78,4 @@ public class CodeRel { public Integer fromType; - /** - * 批准文号 - */ - @TableField(value = "approvalNum") - @ApiModelProperty(value="批准文号") - private String approvalNum; } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/udchs/CodeRelMapper.xml b/src/main/resources/mybatis/mapper/udchs/CodeRelMapper.xml index 797b8e5..9e4ec63 100644 --- a/src/main/resources/mybatis/mapper/udchs/CodeRelMapper.xml +++ b/src/main/resources/mybatis/mapper/udchs/CodeRelMapper.xml @@ -88,9 +88,6 @@ <if test="fromType != null"> fromType, </if> - <if test="approvalNum != null"> - approvalNum, - </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="diNameCode != null"> @@ -129,9 +126,6 @@ <if test="fromType != null"> #{fromType,jdbcType=TINYINT}, </if> - <if test="approvalNum != null"> - #{approvalNum,jdbcType=VARCHAR}, - </if> </trim> </insert> <update id="updateByPrimaryKeySelective" parameterType="com.glxp.udidl.admin.entity.chs.CodeRel"> @@ -231,9 +225,6 @@ <if test="fromType != null"> fromType = #{fromType,jdbcType=TINYINT}, </if> - <if test="approvalNum != null"> - approvalNum = #{approvalNum,jdbcType=TINYINT}, - </if> </set> <where> <if test="diNameCode != null">