1.接口修改 增加查询

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/DynamicFormInstanceMapper.java

@@ -26,9 +26,15 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
      * @param appKey     应用标识
      * @param fieldCodes 列
      * @param groupCode  分组code
+     * @param params 查询参数map
      * @return List<Map>
      */
-    List<Map<String, Object>> listAll(@Param("appKey") String appKey, @Param("fieldCodes") Map<String, Object> fieldCodes, @Param("groupCode") String groupCode);
+    List<Map<String, Object>> listAll(
+            @Param("appKey") String appKey,
+            @Param("fieldCodes") Map<String, Object> fieldCodes,
+            @Param("groupCode") String groupCode,
+            @Param("params") Map<String, String> params
+    );
 
     /**
      * 分页查询
@@ -39,5 +45,11 @@ public interface DynamicFormInstanceMapper extends BaseMapper<DynamicFormInstanc
      * @param groupCode 表单类型
      * @return IPage<Map<String, Object>>
      */
-    IPage<Map<String, Object>> pageList(Page page, @Param("appKey") String appKey, @Param("fieldCodes") Map<String, Object> fieldCodes, @Param("groupCode") String groupCode, @Param("params") Map<String,String> params );
+    IPage<Map<String, Object>> pageList(
+            Page page,
+            @Param("appKey") String appKey,
+            @Param("fieldCodes") Map<String, Object> fieldCodes,
+            @Param("groupCode") String groupCode,
+            @Param("params") Map<String,String> params
+    );
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -39,6 +39,20 @@
 		and i.APP_KEY = #{appKey}
 		GROUP by
 		i.INSTANCE_ID)d
+		<if test="params != null and  params.size() > 0">
+			where
+			1=1
+			<foreach collection="params" index="key" item="value" separator="">
+				<choose>
+					<when test="fieldCodes[key] == 'like' and value !=null and value !=''">
+						and d.${key} like concat('%',#{value},'%')
+					</when>
+					<when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
+						and d.${key} = #{value}
+					</when>
+				</choose>
+			</foreach>
+		</if>
 		order by instanceId desc
 	</select>
 	<select id="pageList" resultType="java.util.Map">

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -12,12 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -38,6 +37,9 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
     @Autowired
     Sequence sequence;
 
+    @Autowired
+    HttpServletRequest request;
+
     /**
      * 每天单个班次执勤人数全部小于等于3人
      */
@@ -53,10 +55,11 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
     public IPage<Map<String, Object>> pageList(int current, int size, String beginDate, String endDate) throws ParseException {
         //1.已column为准 进行返回
         String groupCode = this.getGroupCode();
+        Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
         Page page = new Page(current, size);
-        IPage<Map<String, Object>> iPage = dynamicFormInstanceService.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, null);
+        IPage<Map<String, Object>> iPage = dynamicFormInstanceService.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
         for (Map<String, Object> m : iPage.getRecords()) {
             this.fillDutyShiftData(beginDate, endDate, m);
         }
@@ -116,9 +119,10 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
     public List<Map<String, Object>> list(String beginDate, String endDate) throws ParseException {
         //1.已column为准 进行返回
         String groupCode = this.getGroupCode();
+        Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
-        List<Map<String, Object>> list = dynamicFormInstanceService.getBaseMapper().listAll(RequestContext.getAppKey(), fieldCodes, groupCode);
+        List<Map<String, Object>> list = dynamicFormInstanceService.getBaseMapper().listAll(RequestContext.getAppKey(), fieldCodes, groupCode,params);
         //2.组织值班数据
         for (Map<String, Object> map : list) {
             this.fillDutyShiftData(beginDate, endDate, map);
@@ -126,6 +130,25 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
         return list;
     }
 
+    private Map<String, String> getRequestParamMap() {
+        Map<String, String[]> parameterMap = request.getParameterMap();
+        Map<String, String[]> localMap = new HashMap<>();
+        localMap.putAll(parameterMap);
+        localMap.remove("current");
+        localMap.remove("size");
+        localMap.remove("beginDate");
+        localMap.remove("endDate");
+        Map<String, String> params = new HashMap<>();
+        if (!ValidationUtil.isEmpty(localMap)) {
+            for (String key : localMap.keySet()) {
+                if (!ValidationUtil.isEmpty(localMap.get(key))) {
+                    params.put(key, localMap.get(key)[0]);
+                }
+            }
+        }
+        return params;
+    }
+
     @Override
     public String getGroupCode() {
         return null;