修改bug

master
wangwei 2 years ago
parent 2302660639
commit a2944efa3e

@ -317,6 +317,7 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoSerial());
udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum()); udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1()); udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2()); udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());

@ -47,6 +47,7 @@ public class UdiProductEntity {
private Boolean allowNoBatch; private Boolean allowNoBatch;
private Boolean allowNoExpire; private Boolean allowNoExpire;
private Boolean allowNoProduct; private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc; private String spmc;
private String cplx; private String cplx;
private String hchzsb; private String hchzsb;
@ -78,6 +79,9 @@ public class UdiProductEntity {
private String supId; private String supId;
private Integer relSupId;
public Boolean getAllowNoBatch() { public Boolean getAllowNoBatch() {
if (allowNoBatch == null) if (allowNoBatch == null)
return false; return false;
@ -96,5 +100,11 @@ public class UdiProductEntity {
return allowNoProduct; return allowNoProduct;
} }
public Boolean getAllowNoSerial() {
if (allowNoSerial == null)
return false;
return allowNoSerial;
}
} }

@ -12,6 +12,7 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String cpmctymc; private String cpmctymc;
private String nameCode; private String nameCode;
private String uuid; private String uuid;
private String originUuid;
private String ggxh; private String ggxh;
private String thirdId; private String thirdId;
private Long id; private Long id;
@ -56,12 +57,16 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String uniqueNameCode; private String uniqueNameCode;
private String supName; private String supName;
private String unitFk; private String unitFk;
private String originUuid;
private String relId; private String relId;
private String companyName; private String companyName;
private String bindRlIds; private String bindRlIds;
private String relCode; private String relCode;
private String bindType; private String bindType;
private String certIdFk;
private String manufactory;
private String tyshxydm;
private Boolean dispatch;
private Boolean groupBuy;
} }

@ -70,6 +70,7 @@ public class UdiRelevanceSaveRequest {
private Boolean allowNoBatch; private Boolean allowNoBatch;
private Boolean allowNoExpire; private Boolean allowNoExpire;
private Boolean allowNoProduct; private Boolean allowNoProduct;
private Boolean allowNoSerial;
private String spmc; private String spmc;
private String cplx; private String cplx;
private String hchzsb; private String hchzsb;
@ -85,17 +86,19 @@ public class UdiRelevanceSaveRequest {
private String price; private String price;
private Integer useExpireTime; private Integer useExpireTime;
//关联修改提交:true;单独提交:false
private Boolean relSubmit;
private Integer lowStockNum; private Integer lowStockNum;
private Integer overStockNum; private Integer overStockNum;
private Integer recentDateTime; private Integer recentDateTime;
private Integer isDateBy; private Integer isDateBy;
private String relCode; private String relCode;
//关联修改提交:true;单独提交:false
private Boolean relSubmit;
private boolean dispatch; //是否可配送 private boolean dispatch; //是否可配送
private boolean groupBuy; //是否集采产品 private boolean groupBuy; //是否集采产品
private boolean needCert; //是否需要资质材料
private String certIdFk;
} }

@ -301,6 +301,9 @@
<if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if> <if test="allowNoBatch != null">allowNoBatch=#{allowNoBatch},</if>
<if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if> <if test="allowNoExpire != null">allowNoExpire=#{allowNoExpire},</if>
<if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if> <if test="allowNoProduct != null">allowNoProduct=#{allowNoProduct},</if>
<if test="allowNoSerial != null">
allowNoSerial=#{allowNoSerial},
</if>
<if test="spmc != null">spmc=#{spmc},</if> <if test="spmc != null">spmc=#{spmc},</if>
<if test="cplx != null">cplx=#{cplx},</if> <if test="cplx != null">cplx=#{cplx},</if>
<if test="hchzsb != null">hchzsb=#{hchzsb},</if> <if test="hchzsb != null">hchzsb=#{hchzsb},</if>

@ -251,6 +251,7 @@
<select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest" <select id="filterUdiGp" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse"> resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*, select basic_udirel.*,
bht.name classifyName,
basic_products.originUuid, basic_products.originUuid,
basic_products.nameCode, basic_products.nameCode,
basic_products.deviceRecordKey, basic_products.deviceRecordKey,
@ -288,6 +289,7 @@
basic_products.allowNoBatch, basic_products.allowNoBatch,
basic_products.allowNoExpire, basic_products.allowNoExpire,
basic_products.allowNoProduct, basic_products.allowNoProduct,
basic_products.allowNoSerial,
basic_products.spmc, basic_products.spmc,
basic_products.cplx, basic_products.cplx,
basic_products.hchzsb, basic_products.hchzsb,
@ -304,6 +306,7 @@
FROM basic_products FROM basic_products
inner JOIN basic_udirel inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
<where> <where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null"> <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@ -312,8 +315,8 @@
AND relCode = #{relCode} AND relCode = #{relCode}
</if> </if>
<if test="bindType != '' and bindType != null"> <if test="bindType != '' and bindType != null">
AND relCode is null AND (relCode is null
or trim(relCode) = '' or trim(relCode) = '')
</if> </if>
<if test="supName != '' and supName != null"> <if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%') AND supName LIKE concat('%', #{supName}, '%')
@ -398,6 +401,18 @@
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND basic_udirel.id = #{id} AND basic_udirel.id = #{id}
</if> </if>
<if test="originUuid != null and originUuid != ''">
and originUuid = #{originUuid}
</if>
<if test="manufactory != null and manufactory != ''">
and manufactory LIKE concat('%',#{manufactory},'%')
</if>
<if test="dispatch != null">
and basic_udirel.dispatch = #{dispatch}
</if>
<if test="groupBuy != null">
and basic_udirel.groupBuy = #{groupBuy}
</if>
</where> </where>
ORDER BY modifyTime DESC ORDER BY modifyTime DESC
</select> </select>
@ -761,6 +776,9 @@
<if test="relCode != '' and relCode != null"> <if test="relCode != '' and relCode != null">
relCode=#{relCode}, relCode=#{relCode},
</if> </if>
<if test="needCert != null">
needCert=#{needCert},
</if>
</trim> </trim>
WHERE id = #{id} WHERE id = #{id}
</update> </update>

Loading…
Cancel
Save