UDIbeta版

udims_mango
anthonywj 4 years ago
parent 645211f788
commit 75545dba03

@ -139,7 +139,7 @@ public class FacidentcodeController {
int max = (int) Math.pow(10, count);
String serNum = null;
List<IdentifierEntity> identifierEntities = new ArrayList<>();
for (int i = 1; i < max; i++) {
for (int i = 0; i < max; i++) {
serNum = String.format("%0" + count + "d", i);
IdentifierEntity identifierEntity = new IdentifierEntity();
identifierEntity.setSeqNumber(serNum);

@ -2,12 +2,15 @@ package com.glxp.udi.admin.controller.publish;
import com.github.pagehelper.PageInfo;
import com.glxp.udi.admin.annotation.AuthRuleAnnotation;
import com.glxp.udi.admin.entity.auth.AuthAdmin;
import com.glxp.udi.admin.entity.info.IdentifierEntity;
import com.glxp.udi.admin.entity.publish.UdiDeviceCliEntity;
import com.glxp.udi.admin.entity.publish.UdiDeviceSrgEntity;
import com.glxp.udi.admin.entity.publish.UdiSubProductEntity;
import com.glxp.udi.admin.exception.JsonException;
import com.glxp.udi.admin.req.publish.*;
import com.glxp.udi.admin.res.PageSimpleResponse;
import com.glxp.udi.admin.service.auth.AuthAdminService;
import com.glxp.udi.admin.service.info.IdentifierService;
import com.glxp.udi.admin.service.publish.UdiDeviceCliService;
import com.glxp.udi.admin.service.publish.UdiDeviceSrgService;
@ -22,8 +25,11 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@ -39,20 +45,28 @@ public class SubUdiProductController {
private UdiDeviceSrgService udiDeviceSrgService;
@Resource
private IdentifierService identifierService;
@Resource
AuthAdminService authAdminService;
@AuthRuleAnnotation("")
@PostMapping("/udims/subProduct/add")
public BaseResponse add(@RequestBody @Valid AddSubProductRequest addSubProductRequest, BindingResult bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
UdiSubProductEntity udiSubProductEntity = addSubProductRequest.getUdiSubProductEntity();
udiSubProductEntity.setCustomerId(authAdmin.getCustomerId() + "");
String productId = UuidUtils.getUUId();
if (udiSubProductEntity != null) {
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() ==13) {
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13) {
if (identifierService.isUsedIdentifyCode(udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1))) {
return ResultVOUtils.error(500, "商品条码已被使用");
@ -62,7 +76,7 @@ public class SubUdiProductController {
udiSubProductEntity.setUDI_SubProductOID(productId);
udiSubProductEntity.setStatus("1");
udiSubProductService.insertUdiSubProduct(udiSubProductEntity);
} else return ResultVOUtils.error(500,"添加失败");
} else return ResultVOUtils.error(500, "添加失败");
List<UdiDeviceCliEntity> udiDeviceCliEntities = addSubProductRequest.getUdiDeviceCliEntities();
List<UdiDeviceCliEntity> insertClis = new ArrayList<>();
@ -98,15 +112,23 @@ public class SubUdiProductController {
@PostMapping("/udims/subProduct/modify")
public BaseResponse modify(@RequestBody @Valid AddSubProductRequest addSubProductRequest, BindingResult bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
UdiSubProductEntity udiSubProductEntity = addSubProductRequest.getUdiSubProductEntity();
udiSubProductEntity.setCustomerId(authAdmin.getCustomerId() + "");
UdiSubProductEntity temp = udiSubProductService.selectById(udiSubProductEntity.getUDI_SubProductOID());
udiSubProductEntity.setSYS_Created(DateUtil.getDateTime());
if (udiSubProductEntity != null) {
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() ==13 && !temp.getSPTM().equals(udiSubProductEntity.getSPTM())) {
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13 && !temp.getSPTM().equals(udiSubProductEntity.getSPTM())) {
if (identifierService.isUsedIdentifyCode(udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1))) {
return ResultVOUtils.error(500, "商品条码已被使用");
@ -171,6 +193,13 @@ public class SubUdiProductController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
boolean b = udiSubProductService.deleteUdiSubProduct(deleteUdiProductRequest);
UdiSubProductEntity udiSubProductEntity = udiSubProductService.selectById(deleteUdiProductRequest.getId());
if (udiSubProductEntity.getSPTM() != null && udiSubProductEntity.getSPTM().length() == 13) {
String ideCode = udiSubProductEntity.getSPTM().
substring(0, udiSubProductEntity.getSPTM().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, "0", ideCode, null));
}
if (!b) {
return ResultVOUtils.error(500, "删除失败");
}
@ -182,9 +211,17 @@ public class SubUdiProductController {
public BaseResponse listSubProduct(@Valid FilterUdiSubProductRequest filterUdiSubProductRequest, BindingResult
bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
filterUdiSubProductRequest.setCustomerId(authAdmin.getCustomerId() + "");
List<UdiSubProductEntity> udiProductEntities = udiSubProductService.filterAll(filterUdiSubProductRequest);
PageInfo<UdiSubProductEntity> pageInfo = new PageInfo<>(udiProductEntities);
PageSimpleResponse<UdiSubProductEntity> pageSimpleResponse = new PageSimpleResponse<>();

@ -15,6 +15,7 @@ import com.glxp.udi.admin.service.info.IdentifierService;
import com.glxp.udi.admin.service.publish.UdiDeviceIdService;
import com.glxp.udi.admin.service.publish.UdiDevicepkService;
import com.glxp.udi.admin.service.publish.UdiSubProductService;
import com.glxp.udi.admin.util.DateUtil;
import com.glxp.udi.admin.util.UuidUtils;
import com.glxp.udi.common.enums.ResultEnum;
import com.glxp.udi.common.res.BaseResponse;
@ -54,10 +55,19 @@ public class UdiDeviceIdController {
@PostMapping("/udims/deviceId/add")
public BaseResponse add(@RequestBody @Valid AddUdiDeviceIdRequest addUdiDeviceIdRequest, BindingResult bindingResult) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (attributes == null) {
throw new JsonException(ResultEnum.NOT_NETWORK);
}
HttpServletRequest request = attributes.getRequest();
String userId = request.getHeader("ADMIN_ID");
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
UdiDeviceIdEntity udiDeviceIdEntity = addUdiDeviceIdRequest.getUdiDeviceIdEntity();
udiDeviceIdEntity.setSYS_CreatedBy(DateUtil.getDateTime());
udiDeviceIdEntity.setCustomerId(authAdmin.getCustomerId()+"");
List<UdiDevicepkEntity> udiDevicepkEntities = addUdiDeviceIdRequest.getUdiDevicepkEntities();
String productId = UuidUtils.getUUId();
@ -103,8 +113,8 @@ public class UdiDeviceIdController {
insertPkgs.add(udiDevicepkEntity);
}
udiDevicepkService.insertUdiDevicepkList(insertPkgs);
updateIdentifyStatus(udiDeviceIdEntity,udiDevicepkEntities);
}
updateIdentifyStatus(udiDeviceIdEntity,udiDevicepkEntities);
return ResultVOUtils.success("添加成功");
}
@ -142,9 +152,34 @@ public class UdiDeviceIdController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UdiDeviceIdEntity udiDeviceIdEntity = udiDeviceIdService.selectById(deleteUdiProductRequest.getId());
boolean b = udiDeviceIdService.deleteUdiDeviceId(deleteUdiProductRequest);
//删除关联数据
//toDo
if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 10) {
String ideCode = udiDeviceIdEntity.getPrimaryDeviceId().
substring(1, udiDeviceIdEntity.getPrimaryDeviceId().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "0"));
}
if (udiDeviceIdEntity.getDirectMarkDI() != null && udiDeviceIdEntity.getDirectMarkDI().length() > 10) {
String ideCode = udiDeviceIdEntity.getDirectMarkDI().
substring(1, udiDeviceIdEntity.getDirectMarkDI().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "0"));
}
if (udiDeviceIdEntity.getUseUnitDeviceId() != null && udiDeviceIdEntity.getUseUnitDeviceId().length() > 10) {
String ideCode = udiDeviceIdEntity.getUseUnitDeviceId().
substring(1, udiDeviceIdEntity.getUseUnitDeviceId().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "0"));
}
List<UdiDevicepkEntity> udiDevicepkEntities = udiDevicepkService.selectByDeviceId(deleteUdiProductRequest.getId());
if (udiDevicepkEntities != null && udiDevicepkEntities.size() > 0) {
for (UdiDevicepkEntity udiDevicepkEntity : udiDevicepkEntities) {
String ideCode = udiDevicepkEntity.getPkgDeviceId().
substring(1, udiDevicepkEntity.getPkgDeviceId().length() - 1);
identifierService.updateIsUsed(new IdentifierEntity(null, null, ideCode, "0"));
}
}
if (!b) {
return ResultVOUtils.error(500, "删除失败");
@ -161,6 +196,7 @@ public class UdiDeviceIdController {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
UdiDeviceIdEntity udiDeviceIdEntity = addUdiDeviceIdRequest.getUdiDeviceIdEntity();
udiDeviceIdEntity.setSYS_CreatedBy(DateUtil.getDateTime());
UdiDeviceIdEntity temp = udiDeviceIdService.selectById(udiDeviceIdEntity.getUDI_DeviceIdOID());
if (udiDeviceIdEntity.getPrimaryDeviceId() != null && udiDeviceIdEntity.getPrimaryDeviceId().length() > 13 && !udiDeviceIdEntity.getPrimaryDeviceId().equals(temp.getPrimaryDeviceId())) {
if (identifierService.isUsedIdentifyCode(udiDeviceIdEntity.getPrimaryDeviceId().

@ -32,6 +32,7 @@ public class UdiDeviceIdEntity {
private String UDI_Product_FK; //产品信息
private String Reserve1; //预留一
private String Reserve2; //预留一
private String customerId;
//未用

@ -54,5 +54,8 @@ public class UdiSubProductEntity {
private String SYS_DIVISION;
private String SYS_ORG;
private String SYS_LAST_UPD_BY;
private String mainProductName;
private String customerId;
}

@ -1,5 +1,6 @@
package com.glxp.udi.admin.req.auth;
import com.glxp.udi.admin.req.ListPageRequest;
public class CustomerInfoFilterRequest extends ListPageRequest {

@ -9,5 +9,6 @@ public class FilterUdiSubProductRequest extends ListPageRequest {
private String specification;
private String productId;
private String status;
private String customerId;
}

@ -59,5 +59,7 @@ public class UdiDeviceIdResponse {
private String otherInfoLink;
private String deviceEndDate;
//产品信息
}

@ -12,7 +12,7 @@
deviceCarrier,isSameRegDI,registrationDI,isDirectMark,isSameDeviceId,
directMarkDI,isLotBatch,isSerialNumber,isManufacturingDate,isExpirationDate,
Status,deviceRecordKey,TYSHXYDM,IndentCode,UDI_SubProduct_FK,
UDI_DeviceId_FK,UDI_StandAgency_FK,UDI_FacIdentCode_FK,UDI_Product_FK,Reserve1,Reserve2
UDI_DeviceId_FK,UDI_StandAgency_FK,UDI_FacIdentCode_FK,UDI_Product_FK,Reserve1,Reserve2,customerId
)
values
(
@ -21,7 +21,7 @@
#{directMarkDI}, #{isLotBatch}, #{isSerialNumber}, #{isManufacturingDate}, #{isExpirationDate},
#{Status}, #{deviceRecordKey}, #{TYSHXYDM}, #{IndentCode}, #{UDI_SubProduct_FK},
#{UDI_DeviceId_FK}, #{UDI_StandAgency_FK}, #{UDI_FacIdentCode_FK}, #{UDI_Product_FK}, #{Reserve1},
#{Reserve2}
#{Reserve2}, #{customerId}
)
</insert>
@ -34,7 +34,7 @@
deviceCarrier,isSameRegDI,registrationDI,isDirectMark,isSameDeviceId,
directMarkDI,isLotBatch,isSerialNumber,isManufacturingDate,isExpirationDate,
Status,deviceRecordKey,TYSHXYDM,IndentCode,UDI_SubProduct_FK,
UDI_DeviceId_FK,UDI_StandAgency_FK,UDI_FacIdentCode_FK,UDI_Product_FK,Reserve1,Reserve2
UDI_DeviceId_FK,UDI_StandAgency_FK,UDI_FacIdentCode_FK,UDI_Product_FK,Reserve1,Reserve2,customerId
)
VALUES
<foreach collection="udiProductEntities" item="item" index="index"
@ -49,7 +49,7 @@
#{item.Status}, #{item.deviceRecordKey}, #{item.TYSHXYDM}, #{item.IndentCode}, #{item.UDI_SubProduct_FK},
#{item.UDI_DeviceId_FK}, #{item.UDI_StandAgency_FK}, #{item.UDI_FacIdentCode_FK}, #{item.UDI_Product_FK},
#{item.Reserve1},
#{item.Reserve2}
#{item.Reserve2}, #{item.customerId}
)
</foreach>
</insert>
@ -87,6 +87,8 @@
<if test="UDI_Product_FK != null">UDI_Product_FK=#{UDI_Product_FK},</if>
<if test="Reserve1 != null">Reserve1=#{Reserve1},</if>
<if test="Reserve2 != null">Reserve2=#{Reserve2},</if>
<if test="customerId != null">customerId=#{customerId},</if>
</set>
WHERE UDI_DeviceIdOID=#{UDI_DeviceIdOID}
</update>
@ -104,7 +106,7 @@
<select id="selectBySubProductId" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.publish.UdiDeviceIdEntity">
select * FROM udi_deviceid WHERE UDI_SubProduct_FK = #{subProductId}
select * FROM udi_deviceid WHERE UDI_SubProduct_FK = #{subProductId} ORDER BY SYS_Created desc
</select>
<select id="selectByProductId" parameterType="com.glxp.udi.admin.req.publish.FilterDeviceIdRequest"
resultType="com.glxp.udi.admin.res.publish.UdiDeviceIdResponse">
@ -113,7 +115,8 @@
deviceCarrier,udi_deviceid.isSameRegDI,udi_deviceid.registrationDI,udi_deviceid.isDirectMark,udi_deviceid.isSameDeviceId,udi_deviceid.
directMarkDI,udi_deviceid.isLotBatch,udi_deviceid.isSerialNumber,udi_deviceid.isManufacturingDate,udi_deviceid.isExpirationDate,udi_deviceid.
Status,udi_deviceid.deviceRecordKey,udi_deviceid.TYSHXYDM,udi_deviceid.IndentCode,udi_deviceid.UDI_SubProduct_FK,udi_deviceid.
UDI_DeviceId_FK,udi_deviceid.UDI_StandAgency_FK,udi_deviceid.UDI_FacIdentCode_FK,udi_deviceid.UDI_Product_FK,udi_subproduct.specification
UDI_DeviceId_FK,udi_deviceid.UDI_StandAgency_FK,udi_deviceid.UDI_FacIdentCode_FK,udi_deviceid.UDI_Product_FK,udi_subproduct.specification,
udi_product.productName
from udi_deviceid
INNER JOIN udi_subproduct on udi_deviceid.UDI_SubProduct_FK = udi_subproduct.UDI_SubProductOID
INNER JOIN udi_product on udi_deviceid.UDI_Product_FK = udi_product.UDI_ProductOID
@ -134,7 +137,7 @@
and udi_product.UDI_Customer_FK = #{customerId}
</if>
</where>
ORDER BY udi_deviceid.SYS_Created desc
</select>
@ -169,6 +172,8 @@
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
ORDER BY udi_deviceid.SYS_Created desc
</select>
<select id="selectKeysByIds" parameterType="java.util.List"
@ -181,10 +186,11 @@
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
ORDER BY SYS_Created desc
</select>
<select id="selectByPriId" parameterType="java.lang.String"
resultType="com.glxp.udi.admin.entity.publish.UdiDeviceIdEntity">
select * FROM udi_deviceid WHERE primaryDeviceId = #{primaryDeviceId}
select * FROM udi_deviceid WHERE primaryDeviceId = #{primaryDeviceId} ORDER BY SYS_Created desc
</select>
@ -192,6 +198,6 @@
resultType="com.glxp.udi.admin.entity.publish.UdiDeviceIdEntity">
select *
from udi_deviceid
WHERE UDI_DeviceIdOID=#{UDI_DeviceIdOID}
WHERE UDI_DeviceIdOID=#{UDI_DeviceIdOID} ORDER BY SYS_Created desc
</select>
</mapper>

@ -2,7 +2,55 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.udi.admin.dao.publish.UdiSubProductDao">
<resultMap id="BaseResultMap" type="com.glxp.udi.admin.entity.publish.UdiSubProductEntity">
<result column="UDI_SubProductOID" property="UDI_SubProductOID" />
<result column="SYS_Created" property="SYS_Created" />
<result column="SYS_LAST_UPD" property="SYS_LAST_UPD" />
<result column="SYS_Deleted" property="SYS_Deleted" />
<result column="brandName" property="brandName" />
<result column="productOldCode" property="productOldCode" />
<result column="productCode" property="productCode" />
<result column="companyName" property="companyName" />
<result column="companyGBName" property="companyGBName" />
<result column="regcardCodes" property="regcardCodes" />
<result column="businessLicense" property="businessLicense" />
<result column="deviceType" property="deviceType" />
<result column="productType" property="productType" />
<result column="deviceKit" property="deviceKit" />
<result column="specification" property="specification" />
<result column="deviceDescription" property="deviceDescription" />
<result column="catalogNumber" property="catalogNumber" />
<result column="isMRISafety" property="isMRISafety" />
<result column="MRISafetyInfo" property="MRISafetyInfo" />
<result column="singleUse" property="singleUse" />
<result column="reuseTimes" property="reuseTimes" />
<result column="isDeviceSterile" property="isDeviceSterile" />
<result column="isSterilizationUse" property="isSterilizationUse" />
<result column="sterilizationMethod" property="sterilizationMethod" />
<result column="otherInfoLink" property="otherInfoLink" />
<result column="YBBM" property="YBBM" />
<result column="deviceEndDate" property="deviceEndDate" />
<result column="specialText" property="specialText" />
<result column="clinicalSizeText" property="clinicalSizeText" />
<result column="SPTM" property="SPTM" />
<result column="Quality" property="Quality" />
<result column="QualityUnit" property="QualityUnit" />
<result column="productOldName" property="productOldName" />
<result column="productName" property="productName" />
<result column="SYS_CreatedBy" property="SYS_CreatedBy" />
<result column="SYS_REPLACEMENT" property="SYS_REPLACEMENT" />
<result column="SYS_POSTN" property="SYS_POSTN" />
<result column="SYS_DIVISION" property="SYS_DIVISION" />
<result column="SYS_ORG" property="SYS_ORG" />
<result column="SYS_LAST_UPD_BY" property="SYS_LAST_UPD_BY" />
<result column="UDI_Product_FK" property="UDI_Product_FK" />
<result column="UDI_Registration_FK" property="UDI_Registration_FK" />
<result column="UDI_Enterprise_FK" property="UDI_Enterprise_FK" />
<result column="UDI_SubProduct_FK" property="UDI_SubProduct_FK" />
<result column="status" property="status" />
<result column="customerId" property="customerId" />
<result column="mainProductName" property="mainProductName" />
</resultMap>
<insert id="insertUdiSubProduct"
parameterType="com.glxp.udi.admin.entity.publish.UdiSubProductEntity">
@ -17,7 +65,7 @@
otherInfoLink,YBBM,deviceEndDate,specialText,
clinicalSizeText,SPTM,Quality,QualityUnit,
productOldName,UDI_Product_FK,UDI_Registration_FK,UDI_Enterprise_FK,productName,
UDI_SubProduct_FK,status)
UDI_SubProduct_FK,status,customerId)
values
(
#{UDI_SubProductOID}, #{SYS_Created}, #{SYS_LAST_UPD}, #{SYS_Deleted},
@ -29,7 +77,7 @@
#{otherInfoLink}, #{YBBM}, #{deviceEndDate}, #{specialText},
#{clinicalSizeText}, #{SPTM}, #{Quality}, #{QualityUnit},
#{productOldName}, #{UDI_Product_FK}, #{UDI_Registration_FK}, #{UDI_Enterprise_FK},#{productName},
#{UDI_SubProduct_FK},#{status}
#{UDI_SubProduct_FK},#{status},#{customerId}
)
</insert>
@ -46,7 +94,7 @@
otherInfoLink,YBBM,deviceEndDate,specialText,
clinicalSizeText,SPTM,Quality,QualityUnit,
productOldName,UDI_Product_FK,UDI_Registration_FK,UDI_Enterprise_FK,productName,
UDI_SubProduct_FK,status)
UDI_SubProduct_FK,status,customerId)
VALUES
<foreach collection="udiProductEntities" item="item" index="index"
separator=",">
@ -60,8 +108,8 @@
#{item.otherInfoLink}, #{item.YBBM}, #{item.deviceEndDate}, #{item.specialText},
#{item.clinicalSizeText}, #{item.SPTM}, #{item.Quality}, #{item.QualityUnit},
#{item.productOldName}, #{item.UDI_Product_FK}, #{item.UDI_Registration_FK},
#{item.UDI_Enterprise_FK},#{productName},
#{item.UDI_SubProduct_FK},#{status}
#{item.UDI_Enterprise_FK},#{item.productName},
#{item.UDI_SubProduct_FK},#{item.status},#{item.customerId}
)
</foreach>
@ -113,6 +161,7 @@
<if test="UDI_Enterprise_FK != null">UDI_Enterprise_FK=#{UDI_Enterprise_FK},</if>
<if test="UDI_SubProduct_FK != null">UDI_SubProduct_FK=#{UDI_SubProduct_FK},</if>
<if test="status != null">status=#{status},</if>
<if test="customerId != null">customerId=#{customerId},</if>
</set>
WHERE UDI_SubProductOID=#{UDI_SubProductOID}
@ -121,22 +170,30 @@
<select id="filterAll" parameterType="com.glxp.udi.admin.req.publish.FilterUdiSubProductRequest"
resultType="com.glxp.udi.admin.entity.publish.UdiSubProductEntity">
select *
resultMap="BaseResultMap">
select
udi_subproduct.UDI_SubProductOID,udi_subproduct.SYS_Created,udi_subproduct.SYS_LAST_UPD,udi_subproduct.SYS_Deleted,udi_subproduct.brandName,udi_subproduct.productOldCode,udi_subproduct.productCode,udi_subproduct.companyName,udi_subproduct.companyGBName,udi_subproduct.regcardCodes,udi_subproduct.businessLicense,udi_subproduct.deviceType,udi_subproduct.productType,udi_subproduct.deviceKit,udi_subproduct.specification,udi_subproduct.deviceDescription,udi_subproduct.catalogNumber,udi_subproduct.isMRISafety,udi_subproduct.MRISafetyInfo,udi_subproduct.singleUse,udi_subproduct.reuseTimes,udi_subproduct.isDeviceSterile,udi_subproduct.isSterilizationUse,udi_subproduct.sterilizationMethod,udi_subproduct.otherInfoLink,udi_subproduct.YBBM,udi_subproduct.deviceEndDate,udi_subproduct.specialText,udi_subproduct.clinicalSizeText,udi_subproduct.SPTM,udi_subproduct.Quality,udi_subproduct.QualityUnit,udi_subproduct.productOldName,udi_subproduct.productName,udi_subproduct.SYS_CreatedBy,udi_subproduct.SYS_REPLACEMENT,udi_subproduct.SYS_POSTN,udi_subproduct.SYS_DIVISION,udi_subproduct.SYS_ORG,udi_subproduct.SYS_LAST_UPD_BY,udi_subproduct.UDI_Product_FK,udi_subproduct.UDI_Registration_FK,udi_subproduct.UDI_Enterprise_FK,udi_subproduct.UDI_SubProduct_FK,udi_subproduct.status,udi_subproduct.customerId,
udi_product.productName as mainProductName
from udi_subproduct
INNER JOIN udi_product on udi_subproduct.UDI_Product_FK = udi_product.UDI_ProductOID
<where>
<if test="specification != null and specification != ''">
and specification like concat('%',#{specification},'%')
and udi_subproduct.specification like concat('%',#{specification},'%')
</if>
<if test="status != null and status != ''">
and status = #{status}
and udi_subproduct.status = #{status}
</if>
<if test="productId != null and productId != ''">
and UDI_Product_FK = #{productId}
and udi_subproduct.UDI_Product_FK = #{productId}
</if>
<if test="customerId != null and customerId != ''">
and udi_subproduct.customerId = #{customerId}
</if>
</where>
ORDER BY SYS_Created
ORDER BY udi_subproduct.SYS_Created desc
</select>
<select id="selectCount" parameterType="java.lang.String"

Loading…
Cancel
Save