Merge remote-tracking branch 'origin/深圳三院' into 深圳三院

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/sqlzdy/Service/SwdlServiceImpl.java

@@ -170,10 +170,19 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
             if(BeanUtils.isEmpty(map.get("locationId"))){
                 map.put("locationId",getDiDian());
             }
-            String shenQingRenZh = "%"+map.get("shenQingRenZh")+"%";
-            map.put("shenQingRenZh",shenQingRenZh);
-            String keShiZh = "%"+map.get("keShiZh")+"%";
-            map.put("keShiZh",keShiZh);
+            if(BeanUtils.isNotEmpty(map.get("shenQingRenZh"))){
+                String shenQingRenZh = "%"+map.get("shenQingRenZh")+"%";
+                map.put("shenQingRenZh",shenQingRenZh);
+            }
+            if(BeanUtils.isNotEmpty(map.get("keShiZh"))){
+                String keShiZh = "%"+map.get("keShiZh")+"%";
+                map.put("keShiZh",keShiZh);
+            }
+            if(BeanUtils.isNotEmpty(map.get("yangPinBianHao"))){
+                String yangPinBianHao = "%"+map.get("yangPinBianHao")+"%";
+                map.put("yangPinBianHao",yangPinBianHao);
+            }
+
             List<Map<String,Object>> list = updateDataTableDao.selectMobileInspection(map);
             int totalCount = updateDataTableDao.selectMobileInspectionCount(map);
             APIPageList<Map<String,Object>> pageList = getAPIPageList(list);

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/sqlzdy/control/SwdlController.java

@@ -98,7 +98,6 @@ public class SwdlController extends GenericProvider {
         APIResult result = new APIResult<>();
         try {
             result = swdlService.queryInspectionData(map);
-           // result = mobileInspectionService.queryData(map);
         } catch (Exception e) {
             setExceptionResult(result, StateEnum.ILLEGAL_REQUEST.getCode(), I18nUtil.getMessage(StateEnum.ILLEGAL_REQUEST.getCode() + ""), e);
         }

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UpdateDataTableMapper.xml

@@ -413,7 +413,7 @@
         from t_fjjysqdjb a
         <where>
             <if test="@o.Ognl@isNotEmpty(map.yangPinBianHao)">
-                a.yang_pin_bian_hao = #{map.yangPinBianHao}
+                a.yang_pin_bian_hao like #{map.yangPinBianHao}
             </if>
             <if test="@o.Ognl@isNotEmpty(map.shenQingRenZh)">
                 and a.shen_qing_ren_zh like #{map.shenQingRenZh}
@@ -434,7 +434,7 @@
         from t_fjjysqdjb a
         <where>
             <if test="@o.Ognl@isNotEmpty(map.yangPinBianHao)">
-                a.yang_pin_bian_hao = #{map.yangPinBianHao}
+                a.yang_pin_bian_hao like #{map.yangPinBianHao}
             </if>
             <if test="@o.Ognl@isNotEmpty(map.shenQingRenZh)">
                 and a.shen_qing_ren_zh like #{map.shenQingRenZh}