企业资质审核代码更新完善

src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java

@@ -12,27 +12,34 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.entity.auth.AuthAdmin;
+import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.purchase.SupCertEntity;
 import com.glxp.api.entity.purchase.SupCertSetEntity;
 import com.glxp.api.entity.purchase.SupCompanyEntity;
 import com.glxp.api.entity.purchase.SupManufacturerEntity;
 import com.glxp.api.exception.JsonException;
+import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.purchase.FilterCertSetsRequest;
 import com.glxp.api.req.purchase.FilterSupCertRequest;
 import com.glxp.api.req.purchase.FilterSupManufacturerRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.BasicUdiRelResponse;
 import com.glxp.api.service.auth.AuthAdminService;
+import com.glxp.api.service.basic.BasicUdiRelService;
 import com.glxp.api.service.purchase.SupCertService;
 import com.glxp.api.service.purchase.SupCertSetService;
 import com.glxp.api.service.purchase.SupCompanyService;
 import com.glxp.api.service.purchase.SupManufacturerService;
+import com.glxp.api.util.udi.FilterUdiUtils;
+import io.swagger.annotations.ApiOperation;
 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 springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -42,7 +49,8 @@ import java.util.ListIterator;
 
 @RestController
 public class SupManufacturerController {
-
+    @Resource
+    BasicUdiRelService basicUdiRelService;
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -64,6 +72,28 @@ public class SupManufacturerController {
         return ResultVOUtils.error(500, "企业信息为空");
     }
 
+
+
+
+
+    //获取同步库UDI信息
+    @AuthRuleAnnotation("")
+    @ApiIgnore
+    @ApiOperation(value = "获取同步库UDI信息", response = BasicUdiRelResponse.class)
+    @GetMapping("/sup/manufacturer/getCompanyList")
+    public BaseResponse filterRel(FilterUdiRelRequest filterUdiRelRequest) {
+        System.out.println(filterUdiRelRequest.toString());
+        List<BasicUdiRelResponse> udiDlDeviceResponse = basicUdiRelService.filterList(filterUdiRelRequest);
+        PageInfo<BasicUdiRelResponse> basicUdiRelResponsePageInfo = new PageInfo<>(udiDlDeviceResponse);
+        PageSimpleResponse<BasicUdiRelResponse> basicUdiRelResponsePageSimpleResponse = new PageSimpleResponse<>();
+        basicUdiRelResponsePageSimpleResponse.setTotal(basicUdiRelResponsePageInfo.getTotal());
+        basicUdiRelResponsePageSimpleResponse.setList(udiDlDeviceResponse);
+        return ResultVOUtils.success(basicUdiRelResponsePageSimpleResponse);
+    }
+
+
+
+
     @AuthRuleAnnotation("")
     @GetMapping("/directToCpt/sup/manufacturer/getCompanyList")
     public BaseResponse getCompanyList(FilterSupManufacturerRequest filterSupManufacturerRequest) {

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

@@ -16,7 +16,7 @@ public interface BasicUdiRelMapper extends BaseMapper<BasicUdiRelEntity> {
 
 
     List<BasicUdiRelResponse> filterList(FilterUdiRelRequest filterUdiRelRequest);
-
+    List<BasicUdiRelResponse> filterBasicList(FilterUdiRelRequest filterUdiRelRequest);
 
     List<UserCompanyResponse> findByNameCode(@Param("nameCode") String nameCode);
 

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

@@ -33,7 +33,7 @@ public class BasicUdiRelService extends ServiceImpl<BasicUdiRelMapper, BasicUdiR
         if (null != filterUdiRelRequest.getPage() && null != filterUdiRelRequest.getLimit()) {
             PageHelper.offsetPage((filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(), filterUdiRelRequest.getLimit());
         }
-        return basicUdiRelMapper.filterList(filterUdiRelRequest);
+        return basicUdiRelMapper.filterBasicList(filterUdiRelRequest);
     }
 
     //查找源头企业，1.先找出生产企业；2.找出代理商与购买方

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

@@ -96,6 +96,69 @@
         ORDER BY bur.updateTime DESC
     </select>
 
+    <select id="filterBasicList" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
+            resultType="com.glxp.api.res.basic.BasicUdiRelResponse">
+        select bur.*,
+        uc.companyName,
+        nameCode,
+        packRatio,
+        packLevel,
+        bhxjsl,
+        bhzxxsbzsl,
+        zxxsbzbhsydysl,
+        bhxjcpbm,
+        sjcpbm,
+        bzcj,
+        thirdProductNo,
+        thirdProductName,
+        addType,
+        deviceRecordKey,
+        isUseDy,
+        cpmctymc,
+        cplb,
+        flbm,
+        ggxh,
+        qxlb,
+        tyshxydm,
+        ylqxzcrbarmc,
+        zczbhhzbapzbh,
+        ylqxzcrbarywmc,
+        sydycpbs,
+        versionNumber,
+        diType,
+        scbssfbhph,
+        scbssfbhxlh,
+        scbssfbhscrq,
+        scbssfbhsxrq,
+        ybbm,
+        spmc,
+        cphhhbh,
+        cpms,
+        cpbsbmtxmc,
+        cplx,
+        hchzsb,
+        sfwblztlcp,
+        cgzmraqxgxx,
+        sfbjwycxsy,
+        zdcfsycs,
+        sfwwjbz,
+        syqsfxyjxmj,
+        qtxxdwzlj,
+        mjfs,
+        p.measname,
+        p.manufactory
+        FROM basic_udi_rel bur
+        left JOIN basic_udi_product p on bur.uuid = p.uuid
+        left join user_company uc on bur.companyIdFk = uc.id
+        <where>
+            <if test="customerId != '' and customerId != null">
+                AND bur.companyIdFk = #{customerId}
+            </if>
+
+        </where>
+        ORDER BY bur.updateTime DESC
+    </select>
+
 
     <select id="findByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.res.sup.UserCompanyResponse">