10/21 优化1

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -320,6 +320,7 @@ public class ThrProductsAddDiController {
                     udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
                     udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
                     udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
+                    udiProductEntity.setProductsType(thrProductsAddDiResponse.getProductsType());
 //                    udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
                     udiProductEntity.setCatalogname1(thrProductsAddDiResponse.getCatalogname1());
                     udiProductEntity.setCatalogname2(thrProductsAddDiResponse.getCatalogname2());

src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java

@@ -136,7 +136,7 @@ public class ThrProductsController {
 
 
         if (null == thrProductsEntity)
-            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);;
         BeanUtil.copyProperties(thrProductsEntity, filterThrProductsRequest);
         List<ThrProductsEntity> thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest);
         if (thrProductsEntities.size() == 0) {

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -403,6 +403,12 @@ public class ThrProductsAddDiEntity {
     @ApiModelProperty(value = "来源类型 1新增；0选入")
     private Integer sourceType;
 
+    /**
+     * 产品类型 1:器械；2:药品
+     */
+    @TableField(value = "productsType")
+    private Integer productsType;
+
     /**
      * 内部物资编码
      */

src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java

@@ -53,9 +53,8 @@ public class FilterThrProductsRequest extends ListPageRequest {
 
     private String internalMaterialCode;
 
-    /**
+
-     * 产品参数
+    private Integer productsType ;
-     */
+    private Integer productType ;
-    private Integer productType = 1;
 
 }

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

@@ -61,4 +61,6 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
     @TableField(value = "internalMaterialCode")
     @ApiModelProperty(value = "'内部物资编码'")
     private String internalMaterialCode;
+
+    private Integer productsType;
 }

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -447,6 +447,7 @@ public class UdiProductServiceImpl implements UdiProductService {
         entity.setBhxjsl(request.getMyBhxjsl());
         entity.setDiType(request.getDiType());
         entity.setXjdw(request.getXjdw());
+        entity.setUpdateTime(new Date());
     }
 
     @Override
@@ -568,6 +569,7 @@ public class UdiProductServiceImpl implements UdiProductService {
                     }
                 }
                 udiProductEntity.setBhsycjsl(bhltsl);
+                udiProductEntity.setUpdateTime(new Date());
             }
         }
 

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

@@ -185,8 +185,8 @@
         FROM thr_products_add_di tdi
                      left join basic_corp bc on tdi.customerId = bc.erpId
         <where>
-            <if test="productType != null">
+            <if test="productsType != null">
-                AND tdi.productType = #{productType}
+                AND tdi.productsType = #{productsType}
             </if>
             <if test="checkStatus != null">
                 AND tdi.status = #{checkStatus}

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

@@ -83,6 +83,9 @@
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
             </if>
+            <if test="productType != '' and productType != null">
+                AND productType = #{productType}
+            </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE #{supName}
             </if>

src/main/resources/schemas/schema_v2.4.sql

@@ -1017,6 +1017,11 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'productType',
                          1);
 
 
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'productsType',
+                         ' tinyint NULL DEFAULT NULL COMMENT ''产品类型; 1:器械 2:药品''',
+                         1);
+
+
 CALL Pro_Temp_ColumnWork('io_code_temp', 'drugLink',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''药品关联关系是否存在 0不存在 1存在''',
                          1);