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

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

@@ -77,6 +77,8 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
             if(BeanUtils.isEmpty(map.get("locationId"))){
                 map.put("locationId",getDiDian());
             }
+            map.put("shiFouQiYong","%"+map.get("shiFouQiYong")+"%");
+            map.put("daiLiRenXingM","%"+map.get("daiLiRenXingM")+"%");
             List<Map<String,Object>> list = updateDataTableDao.selectByLocation(map);
             int totalCount = updateDataTableDao.selectByLocationCount(map);
             APIPageList<Map<String,Object>> pageList = getAPIPageList(list);
@@ -105,9 +107,7 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
             if (BeanUtils.isEmpty(map.get("locationId"))) {
                 map.put("locationId", getDiDian());
             }
-            if (BeanUtils.isEmpty(map.get("examinee"))) {
-                map.put("examinee", EXAMINEE);
-            }
+
             Map mapDeal = getMapV2(map);
             List<Map<String, Object>> list = updateDataTableDao.selectMobileExInfo(mapDeal);
             int totalCount = updateDataTableDao.selectMobileExInfoCount(mapDeal);
@@ -244,15 +244,24 @@ public class SwdlServiceImpl extends GenericProvider implements SwdlService {
             stringObjectHashMap.put("startPage", map.get("startPage"));
             stringObjectHashMap.put("locationId", getDiDian());
             Map param = (Map) map.get("param");
-
-            stringObjectHashMap.put("examName",param.get("examName"));
-            stringObjectHashMap.put("bankName",param.get("bankName"));
-
+            if(BeanUtils.isNotEmpty(param.get("examName"))){
+                stringObjectHashMap.put("examName","%"+param.get("examName")+"%");
+            }
+            if(BeanUtils.isNotEmpty(param.get("bankName"))){
+                stringObjectHashMap.put("bankName","%"+param.get("bankName")+"%");
+            }
+            if (BeanUtils.isEmpty(param.get("examinee"))) {
+                stringObjectHashMap.put("examinee", EXAMINEE);
+            }else{
+                stringObjectHashMap.put("examinee",param.get("examinee"));
+            }
             stringObjectHashMap.put("startDateUp",param.get("startDate^S"));
             stringObjectHashMap.put("startDateLower",param.get("startDate^E"));
             stringObjectHashMap.put("limitDateUp",param.get("limitDate^S"));
             stringObjectHashMap.put("limitDateLower",param.get("limitDate^E"));
-            stringObjectHashMap.put("examType",String.join(",", (ArrayList)param.get("examType")));
+            if(BeanUtils.isNotEmpty(param.get("examType"))){
+                stringObjectHashMap.put("examType",String.join(",", (ArrayList)param.get("examType")));
+            }
         }
         return stringObjectHashMap;
     }

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

@@ -256,8 +256,17 @@
         select a.*,
                b.name_
         from t_swdl a left join ibps_party_employee b on a.create_by_ = b.ID_
-        where a.di_dian_ = #{map.locationId} and a.shi_fou_qi_yong_ like '%enabled%' order by a.create_time_ desc
-             limit ${map.startPage},${map.limit}
+        <where>
+            a.di_dian_ = #{map.locationId}
+            <if test="@o.Ognl@isNotEmpty(map.shiFouQiYong)">
+                and a.shi_fou_qi_yong_ like #{map.shiFouQiYong}
+            </if>
+            <if test="@o.Ognl@isNotEmpty(map.daiLiRenXingM)">
+                and a.dai_li_ren_xing_m like #{map.daiLiRenXingM}
+            </if>
+        </where>
+         order by a.create_time_ desc
+        limit ${map.startPage},${map.limit}
     </select>
     <select id="selectByLocationCount" resultType="java.lang.Integer" parameterType="java.util.Map">
         select count(a.id_) as count from t_swdl a where a.di_dian_ = #{map.locationId} and a.shi_fou_qi_yong_ like '%enabled%'
@@ -497,14 +506,14 @@
             AND FIND_IN_SET(a.examType, #{map.examType})
         </if>
         <if test="@o.Ognl@isNotEmpty(map.examName)">
-            AND a.examName like CONCAT('%', #{map.examName}, '%')
+            AND a.examName like  #{map.examName}
         </if>
         <if test="@o.Ognl@isNotEmpty(map.bankName)">
-            AND a.bankName like CONCAT('%', #{map.bankName}, '%')
+            AND a.bankName like #{map.bankName}
         </if>
 
         <if test="@o.Ognl@isNotEmpty(map.startDateUp)">
-            AND date(a.startDate) >= date(#{map.startDateUp})
+            AND a.startDate >= #{map.startDateUp}
         </if>
         <if test="@o.Ognl@isNotEmpty(map.startDateLower)">
             AND a.startDate <![CDATA[ <= ]]> #{map.startDateLower}