定数包设置代码提交

src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java

@@ -1,7 +1,278 @@
 package com.glxp.api.controller.basic;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.enums.ResultEnum;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.purchase.PurApplyDetailEntity;
+import com.glxp.api.entity.thrsys.ThrProductsEntity;
+import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.BasicDestinyRelRequest;
+import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest;
+import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.thrsys.FilterThrProductsRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.service.auth.AuthAdminService;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.basic.BasicDestinyRelService;
+import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.service.thrsys.ThrProductsService;
+import com.glxp.api.util.BeanCopyUtils;
+import com.glxp.api.util.udi.FilterUdiUtils;
+import org.springframework.validation.BindingResult;
+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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 public class BasicDestinyRelController {
+
+    @Resource
+    private ThrProductsService thrProductsService;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private UdiRelevanceService udiRelevanceService;
+    @Resource
+    private AuthAdminService authAdminService;
+    @Resource
+    private BasicDestinyRelService basicDestinyRelService;
+
+    @GetMapping("/udiwms/basic/destiny/model/filter")
+    public BaseResponse filterModeldestiny(FilterThrProductsRequest filterThrProductsRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts(filterThrProductsRequest);
+        PageInfo<ThrProductsEntity> pageInfo = new PageInfo<>(thrProductsEntities);
+        PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrProductsEntities);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @PostMapping("/udiwms/basic/destiny/model/addModeldestiny")
+    public BaseResponse addModeldestiny(@RequestBody ThrProductsEntity thrProductsEntity) {
+
+        //判断名字和编号不能重复
+        QueryWrapper<ThrProductsEntity> ew = new QueryWrapper<>();
+        ew.eq("name", thrProductsEntity.getName());
+        ew.eq("type", 2);
+        long count = thrProductsService.count(ew);
+        if (count > 0) {
+            return ResultVOUtils.error(999, "名称已存在！");
+        }
+        ew.clear();
+        ew.eq("code", thrProductsEntity.getCode());
+        ew.eq("type", 2);
+        count = thrProductsService.count(ew);
+        if (count > 0) {
+            return ResultVOUtils.error(999, "编号已存在！");
+        }
+
+        AuthAdmin authAdmin = customerService.getUserBean();
+        thrProductsEntity.setId(IdUtil.getSnowflakeNextId());
+        thrProductsEntity.setType(2);
+        thrProductsEntity.setCreateTime(new Date());
+        thrProductsEntity.setUpdateTime(new Date());
+        thrProductsEntity.setCreateUser(authAdmin.getId() + "");
+        thrProductsEntity.setUpdateUser(authAdmin.getId() + "");
+
+        Boolean falg = thrProductsService.insertThrProducts(thrProductsEntity);
+        if (!falg) {
+            return ResultVOUtils.error(999, "新增失败！");
+        }
+        return ResultVOUtils.success();
+    }
+
+    @PostMapping("/udiwms/basic/destiny/model/editModeldestiny")
+    public BaseResponse editModeldestiny(@RequestBody ThrProductsEntity thrProductsEntity) {
+
+        //判断名字和编号不能重复
+        QueryWrapper<ThrProductsEntity> ew = new QueryWrapper<>();
+        ew.eq("name", thrProductsEntity.getName());
+        ew.eq("type", 2);
+        ThrProductsEntity thrProductsEntity1 = thrProductsService.getOne(ew);
+        if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(thrProductsEntity.getId())) {
+            return ResultVOUtils.error(999, "名称已存在！");
+        }
+        ew.clear();
+        ew.eq("code", thrProductsEntity.getCode());
+        ew.eq("type", 2);
+        thrProductsEntity1 = thrProductsService.getOne(ew);
+        if (thrProductsEntity1 != null && !thrProductsEntity1.getId().equals(thrProductsEntity.getId())) {
+            return ResultVOUtils.error(999, "编号已存在！");
+        }
+
+        AuthAdmin authAdmin = customerService.getUserBean();
+        thrProductsEntity.setUpdateTime(new Date());
+        thrProductsEntity.setUpdateUser(authAdmin.getId() + "");
+
+        Boolean falg = thrProductsService.updateById(thrProductsEntity);
+        if (!falg) {
+            return ResultVOUtils.error(999, "编辑失败！");
+        }
+        return ResultVOUtils.success();
+    }
+
+    @PostMapping("/udiwms/basic/destiny/model/delectModeldestiny")
+    public BaseResponse delectModeldestiny(@RequestBody ThrProductsEntity thrProductsEntity) {
+
+        Boolean falg = thrProductsService.deleteById(thrProductsEntity.getId() + "");
+        if (!falg) {
+            return ResultVOUtils.error(999, "删除失败！");
+        }
+        return ResultVOUtils.success();
+    }
+
+    //查询产品信息
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/basic/destiny/model/product/filter")
+    public BaseResponse filterDestinyProduct(CompanyProductRelevanceRequest companyProductRelevanceRequest, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getCustomerId())) {
+            String customerId = getCustomerId();
+            if (customerId.equals("110")) {
+                companyProductRelevanceRequest.setCustomerId(null);
+            }
+        }
+
+        companyProductRelevanceRequest.setIsDisable(false);
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUdiCode())) {
+            UdiEntity udiEntity = FilterUdiUtils.getUdi(companyProductRelevanceRequest.getUdiCode());
+            if (udiEntity != null) {
+                companyProductRelevanceRequest.setNameCode(udiEntity.getUdi());
+                companyProductRelevanceRequest.setUnionCode(udiEntity.getUdi());
+            }
+        }
+        //如果输入DI标识，精确找到不同层级对应的产品信息
+        if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) {
+            FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
+            filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode());
+            List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
+            if (temps != null && temps.size() > 0) {
+                companyProductRelevanceRequest.setOriginUuid(temps.get(0).getOriginUuid());
+                companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode());
+                companyProductRelevanceRequest.setUnionCode(null);
+            }
+        } else {
+            //只查找主标识产品信息
+            companyProductRelevanceRequest.setDiType(1);
+        }
+        //查询详情id过滤
+        List<Long> idList = basicDestinyRelService.filterDestinyRelIds(Long.valueOf(companyProductRelevanceRequest.getId()));
+
+        List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
+        FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
+        BeanCopyUtils.copy(companyProductRelevanceRequest, filterUdiRelRequest);
+        if (idList.size() > 0) {
+            filterUdiRelRequest.setIds(idList);
+        }
+        basicInstrumentMaintainRelevanceResponses = basicDestinyRelService.filterUdiJoinSup(filterUdiRelRequest);
+        PageInfo<UdiRelevanceResponse> pageInfo;
+        pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
+        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    public String getCustomerId() {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        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));
+        return authAdmin.getCustomerId() + "";
+    }
+
+    @PostMapping("/udiwms/basic/destiny/model/addModeldestinyProduct")
+    public BaseResponse addModeldestinyProduct(@RequestBody BasicDestinyRelRequest basicDestinyRelRequest) {
+
+        Boolean falg = basicDestinyRelService.addModeldestinyProduct(basicDestinyRelRequest);
+
+        if (!falg) {
+            return ResultVOUtils.error(999, "选入失败！");
+        }
+        return ResultVOUtils.success();
+    }
+
+    @GetMapping("/udiwms/basic/destiny/model/filterDestinyDelect")
+    public BaseResponse filterDestinyDelect(FilterUdiRelRequest filterUdiRelRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<UdiRelevanceResponse> thrProductsEntities = new ArrayList<>();
+        //查询详情id过滤
+        List<Long> idList = basicDestinyRelService.filterDestinyRelIds(Long.valueOf(filterUdiRelRequest.getId()));
+        if (idList != null && idList.size() > 0) {
+            filterUdiRelRequest.setIds(idList);
+            filterUdiRelRequest.setDiType(1);
+            thrProductsEntities = basicDestinyRelService.filterDestinyProducts(filterUdiRelRequest);
+            int i=0;
+            for (UdiRelevanceResponse thrProductsEntity : thrProductsEntities) {
+                thrProductsEntity.setIndex(i);
+                i++;
+            }
+        }
+        PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(thrProductsEntities);
+        PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(thrProductsEntities);
+
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @GetMapping("/udiwms/basic/destiny/model/delectModeldestinyProduct")
+    public BaseResponse delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
+
+        Boolean falg = basicDestinyRelService.delectModeldestinyProduct(basicDestinyRelRequest);
+
+        if (!falg) {
+            return ResultVOUtils.error(999, "删除失败！");
+        }
+        return ResultVOUtils.success();
+    }
+
+    @PostMapping("/udiwms/basic/destiny/model/uploadModeldestinyProduct")
+    public BaseResponse uploadModeldestinyProduct(@RequestBody BasicDestinyRelRequest basicDestinyRelRequest) {
+
+        Boolean falg = basicDestinyRelService.uploadModeldestinyProduct(basicDestinyRelRequest);
+
+        if (!falg) {
+            return ResultVOUtils.error(999, "更新失败！");
+        }
+        return ResultVOUtils.success();
+    }
+
+
+
 }

src/main/java/com/glxp/api/dao/basic/BasicDestinyRelMapper.java

@@ -1,9 +1,21 @@
 package com.glxp.api.dao.basic;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.glxp.api.entity.basic.BasicDestinyRel;
+import com.glxp.api.dao.BaseMapperPlus;
+import com.glxp.api.entity.basic.BasicCorpEntity;
+import com.glxp.api.entity.basic.BasicDestinyRelEntity;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
-public interface BasicDestinyRelMapper extends BaseMapper<BasicDestinyRel> {
+public interface BasicDestinyRelMapper extends BaseMapperPlus<BasicDestinyRelMapper, BasicDestinyRelEntity, BasicDestinyRelEntity> {
+
+    List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
+
+    List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
+
+
 }

src/main/java/com/glxp/api/entity/basic/BasicDestinyRelEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "udi_wms.basic_destiny_rel")
-public class BasicDestinyRel {
+public class BasicDestinyRelEntity {
     @TableId(value = "id", type = IdType.INPUT)
     private Long id;
 

src/main/java/com/glxp/api/req/basic/BasicDestinyRelRequest.java

@@ -0,0 +1,21 @@
+package com.glxp.api.req.basic;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BasicDestinyRelRequest {
+    private List<Long> list;
+    private Long pId;
+    private Long id;
+    private int count;
+    public List<Long> getList() {
+        return list;
+    }
+
+    public Long getpId() {
+        return pId;
+    }
+}

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -98,6 +98,7 @@ public class UdiRelevanceResponse {
     private Integer recentDateTime;
     private Integer isDateBy;
     private String relCode;
+    private int index;
 
     //关联查询字典
     private String unitFk;          //供应商ID
@@ -120,6 +121,8 @@ public class UdiRelevanceResponse {
     private String syqsfxyjxmj;
     private String mjfs;
     private String categoryName;
+    private int count;
+    private Long deId;
 
 
     private Integer bpcrid;

src/main/java/com/glxp/api/service/basic/BasicDestinyRelService.java

@@ -1,7 +1,24 @@
 package com.glxp.api.service.basic;
 
+import com.glxp.api.req.basic.BasicDestinyRelRequest;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.res.basic.UdiRelevanceResponse;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 public interface BasicDestinyRelService{
 
+    Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
+
+    List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
+
+    List<Long> filterDestinyRelIds(Long pId);
+
+    List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
+
+    Boolean delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
+
+    Boolean uploadModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
+
 }

src/main/resources/mybatis/mapper/basic/BasicDestinyRelMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicDestinyRelMapper">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicDestinyRel">
+  <resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicDestinyRelEntity">
     <!--@mbg.generated-->
     <!--@Table udi_wms.basic_destiny_rel-->
     <id column="id" jdbcType="BIGINT" property="id" />
@@ -13,4 +13,287 @@
     <!--@mbg.generated-->
     id, relId, pId, `count`
   </sql>
+
+
+  <select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+          resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+    select basic_udirel.*,
+    basic_products.id as PRId,
+    basic_products.originUuid,
+    basic_products.nameCode,
+    basic_products.deviceRecordKey,
+    basic_products.packRatio,
+    basic_products.packUnit,
+    basic_products.packLevel,
+    basic_products.bhxjsl,
+    basic_products.bhzxxsbzsl,
+    basic_products.zxxsbzbhsydysl,
+    basic_products.bhxjcpbm,
+    basic_products.bzcj,
+    basic_products.cpmctymc,
+    basic_products.cplb,
+    basic_products.flbm,
+    basic_products.ggxh,
+    basic_products.qxlb,
+    basic_products.tyshxydm,
+    basic_products.ylqxzcrbarmc,
+    basic_products.zczbhhzbapzbh,
+    basic_products.ylqxzcrbarywmc,
+    basic_products.sydycpbs,
+    basic_products.sjcpbm,
+    basic_products.versionNumber,
+    basic_products.diType,
+    basic_products.ybbm,
+    basic_products.sptm,
+    basic_products.manufactory,
+    basic_products.measname,
+    basic_products.productType,
+    basic_products.scbssfbhph,
+    basic_products.scbssfbhxlh,
+    basic_products.scbssfbhscrq,
+    basic_products.scbssfbhsxrq,
+    basic_products.cpms,
+    basic_products.allowNoBatch,
+    basic_products.allowNoExpire,
+    basic_products.allowNoProduct,
+    basic_products.allowNoSerial,
+    basic_products.spmc,
+    basic_products.cplx,
+    basic_products.hchzsb,
+    basic_products.cpdls,
+    company_product_relevance.price,
+    basic_products.basicPrductRemak1,
+    basic_products.basicPrductRemak2,
+    basic_products.basicPrductRemak3,
+    basic_products.basicPrductRemak4,
+    basic_products.basicPrductRemak5,
+    basic_products.basicPrductRemak6,
+    basic_products.basicPrductRemak7,
+    basic_products.basicPrductRemak8,
+    basic_products.sfwblztlcp,
+    basic_products.cgzmraqxgxx,
+    basic_products.sfbjwycxsy,
+    basic_products.zdcfsycs,
+    basic_products.sfwwjbz,
+    basic_products.syqsfxyjxmj,
+    basic_products.mjfs,
+    basic_products.categoryName,
+    company_product_relevance.unitFk,
+    basic_corp.erpId  as customerId,
+    basic_corp.name      companyName
+    FROM basic_udirel
+    inner JOIN basic_products
+    ON basic_products.uuid = basic_udirel.uuid
+    left join company_product_relevance
+    on basic_udirel.id = company_product_relevance.udiRlIdFk
+    left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
+    left join basic_hosp_type bht on basic_udirel.relCode = bht.code
+    left join thr_products tp on tp.code = basic_udirel.mainId
+    left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id
+    left join basic_product_category on basic_product_category_rel.code = basic_product_category.code
+    <where>
+      <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+        AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
+      </if>
+      <if test="category != '' and category != null">
+        AND basic_product_category.name = #{category}
+      </if>
+      <if test="manufactory != '' and manufactory != null">
+        AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
+      </if>
+
+      <if test="supName != '' and supName != null">
+        AND supName LIKE concat('%', #{supName}, '%')
+      </if>
+      <if test="ids != null and ids.size() > 0">
+        and basic_udirel.id not in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="pinyinInitial != null and pinyinInitial != ''">
+        AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
+      </if>
+      <if test="thrPiId != '' and thrPiId != null">
+        and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
+        or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
+        or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
+        or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
+        or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
+      </if>
+      <if test="ggxh != '' and ggxh != null">
+        AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
+      </if>
+      <if test="cpmctymc != '' and cpmctymc != null">
+        AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+      </if>
+      <if test="nameCode != '' and nameCode != null">
+        AND nameCode LIKE concat(#{nameCode}, '%')
+      </if>
+      <if test="thirdId != '' and thirdId != null">
+        AND basic_udirel.thirdId LIKE concat(#{thirdId}, '%')
+      </if>
+      <if test="uuid != '' and uuid != null">
+        AND basic_udirel.uuid = #{uuid}
+      </if>
+      <if test="unitFk != '' and unitFk != null">
+        AND company_product_relevance.unitFk = #{unitFk}
+      </if>
+      <if test="id != '' and id != null">
+        AND basic_udirel.id = #{id}
+      </if>
+      <if test="udplatCode != '' and udplatCode != null">
+        AND basic_udirel.udplatCode = #{udplatCode}
+      </if>
+      <if test="diType != null">
+        AND basic_products.diType = #{diType}
+      </if>
+      <if test="lockStatus != '' and lockStatus != null">
+        AND basic_udirel.lockStatus = #{lockStatus}
+      </if>
+      <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+        AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
+      </if>
+      <if test="lastUpdateTime != null and lastUpdateTime != ''">
+        <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+      </if>
+      <if test="mainId != '' and mainId != null">
+        AND mainId = #{mainId}
+      </if>
+      <if test="unionFilterStr != '' and unionFilterStr != null">
+        or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
+        or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
+        or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
+        or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
+      </if>
+      <if test="isAdavence != '' and isAdavence != null">
+        AND isAdavence = #{isAdavence}
+      </if>
+      <if test="uniqueNameCode != '' and uniqueNameCode != null">
+        AND nameCode = #{uniqueNameCode}
+      </if>
+      <if test="relIds != null and relIds.size() > 0">
+        and   basic_udirel.id in
+        <foreach collection="relIds" item="item" index="index" separator="," open="(" close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="flbm != '' and flbm != null">
+        and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm} or
+        basic_udirel.relCode = #{flbm})
+      </if>
+      <if test="companyName != '' and companyName != null">
+        AND basic_corp.name like concat('%', #{companyName}, '%')
+      </if>
+      <if test="basicPrductRemak1 != '' and basicPrductRemak1 != null">
+        AND basic_products.basicPrductRemak1 like concat('%', #{basicPrductRemak1}, '%')
+      </if>
+      <if test="basicPrductRemak2 != '' and basicPrductRemak2 != null">
+        AND basic_products.basicPrductRemak2 like concat('%', #{basicPrductRemak2}, '%')
+      </if>
+      <if test="basicPrductRemak3 != '' and basicPrductRemak3 != null">
+        AND basic_products.basicPrductRemak3 like concat('%', #{basicPrductRemak3}, '%')
+      </if>
+      <if test="basicPrductRemak4 != '' and basicPrductRemak4 != null">
+        AND basic_products.basicPrductRemak4 like concat('%', #{basicPrductRemak4}, '%')
+      </if>
+      <if test="basicPrductRemak5 != '' and basicPrductRemak5 != null">
+        AND basic_products.basicPrductRemak5 like concat('%', #{basicPrductRemak5}, '%')
+      </if>
+      <if test="basicPrductRemak6 != '' and basicPrductRemak6 != null">
+        AND basic_products.basicPrductRemak6 like concat('%', #{basicPrductRemak6}, '%')
+      </if>
+      <if test="basicPrductRemak7 != '' and basicPrductRemak7 != null">
+        AND basic_products.basicPrductRemak7 like concat('%', #{basicPrductRemak7}, '%')
+      </if>
+      <if test="basicPrductRemak8 != '' and basicPrductRemak8 != null">
+        AND basic_products.basicPrductRemak8 like concat('%', #{basicPrductRemak8}, '%')
+      </if>
+    </where>
+    GROUP BY basic_udirel.id
+
+  </select>
+
+
+
+  <select id="filterDestinyProducts" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+          resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
+    SELECT
+    basic_udirel.*,
+    basic_products.id AS PRId,
+    basic_products.originUuid,
+    basic_products.nameCode,
+    basic_products.deviceRecordKey,
+    basic_products.packRatio,
+    basic_products.packUnit,
+    basic_products.packLevel,
+    basic_products.bhxjsl,
+    basic_products.bhzxxsbzsl,
+    basic_products.zxxsbzbhsydysl,
+    basic_products.bhxjcpbm,
+    basic_products.bzcj,
+    basic_products.cpmctymc,
+    basic_products.cplb,
+    basic_products.flbm,
+    basic_products.ggxh,
+    basic_products.qxlb,
+    basic_products.tyshxydm,
+    basic_products.ylqxzcrbarmc,
+    basic_products.zczbhhzbapzbh,
+    basic_products.ylqxzcrbarywmc,
+    basic_products.sydycpbs,
+    basic_products.sjcpbm,
+    basic_products.versionNumber,
+    basic_products.diType,
+    basic_products.ybbm,
+    basic_products.sptm,
+    basic_products.manufactory,
+    basic_products.measname,
+    basic_products.productType,
+    basic_products.scbssfbhph,
+    basic_products.scbssfbhxlh,
+    basic_products.scbssfbhscrq,
+    basic_products.scbssfbhsxrq,
+    basic_products.cpms,
+    basic_products.allowNoBatch,
+    basic_products.allowNoExpire,
+    basic_products.allowNoProduct,
+    basic_products.allowNoSerial,
+    basic_products.spmc,
+    basic_products.cplx,
+    basic_products.hchzsb,
+    basic_products.cpdls,
+    basic_products.basicPrductRemak1,
+    basic_products.basicPrductRemak2,
+    basic_products.basicPrductRemak3,
+    basic_products.basicPrductRemak4,
+    basic_products.basicPrductRemak5,
+    basic_products.basicPrductRemak6,
+    basic_products.basicPrductRemak7,
+    basic_products.basicPrductRemak8,
+    basic_destiny_rel.count as count,
+    basic_destiny_rel.id as deId
+    FROM
+    basic_udirel
+    INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
+    INNER JOIN basic_destiny_rel ON basic_destiny_rel.relId = basic_udirel.id
+    <where>
+      <if test="ids != null and ids.size() > 0">
+        and basic_udirel.id  in
+        <foreach collection="ids" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="diType != null">
+        AND basic_products.diType = #{diType}
+      </if>
+      <if test="cpmctymc != '' and cpmctymc != null">
+        AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
+      </if>
+    </where>
+  </select>
+
+
 </mapper>