1.修改物资入院审核页面供应商院内字典添加的产品信息部分字段无信息的问题

src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java

@@ -32,6 +32,10 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
 
     private String companyName;
 
+    /**
+     * 规格型号
+     */
+    private String standard;
 
     private String price;
     private String basicPrductRemak1;

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java

@@ -38,6 +38,13 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
             PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
         }
         List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest);
+
+        if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) {
+            thrProductsAddDiResponses.forEach(thrProductsAddDiResponse -> {
+                thrProductsAddDiResponse.setStandard(thrProductsAddDiResponse.getSpec());
+                thrProductsAddDiResponse.setZczbhhzbapzbh(thrProductsAddDiResponse.getRegisterNo());
+            });
+        }
         return thrProductsAddDiResponses;
     }
 
@@ -84,10 +91,10 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         List<ThrProductsAddDiEntity> list = new ArrayList<>(uuids.size());
         Date date = new Date();
         for (String uuid : uuids) {
-            ProductInfoEntity productInfoEntity=productInfoService.selectByUuid(uuid).get(0);
+            ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0);
             ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity();
             BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity);
-            thrProductsAddDiEntity.setCustomerId(customerId+"");
+            thrProductsAddDiEntity.setCustomerId(customerId + "");
             thrProductsAddDiEntity.setUuid(uuid);
             thrProductsAddDiEntity.setType(1);
             thrProductsAddDiEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc());
@@ -124,8 +131,8 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
 
     @Override
     public UdiInfoResponse getDiProductDetail(String uuid) {
-       ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
-        UdiInfoResponse udiInfoResponse=thrProductsAddDiDao.getDiProductDetail(uuid);
+        ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
+        UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid);
         udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm());
         udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
         udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
@@ -133,7 +140,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
         udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
         udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
         udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
-       return udiInfoResponse;
+        return udiInfoResponse;
     }
 
     @Override

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -150,9 +150,10 @@
 
     <select id="filterThrProductsList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
-        SELECT tdi.*, bc.name companyName
+        SELECT tdi.*,
+               bc.name        companyName
         FROM thr_products_add_di tdi
-                     left join basic_corp bc on tdi.customerId = bc.erpId
+                 left join basic_corp bc on tdi.customerId = bc.erpId
         <where>
             <if test="checkStatus != null">
                 AND tdi.status = #{checkStatus}