debug

src/main/java/com/qs/serve/modules/exl/common/ExlConst.java

@@ -9,6 +9,7 @@ public interface ExlConst {
     String TABLE_NAME_PRE = "exd_";
     String TABLE_COMMENT_PRE = "excel数据-";
 
+    String DATETIME_TYPE = "datetime";
     String DATE_TYPE = "date";
     String TYPE_INT = "int";
     String TYPE_MONEY = "money";

src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java

@@ -89,7 +89,8 @@ public class ExlTableConfController {
         exlTableConf.setColumnList(columnConfList);
         //组装查询参数列表
         List<ExlColumnConf> queryColumn = columnConfList.stream()
-                .filter(a->a.getConditionFlag().equals(1)).collect(Collectors.toList());
+                .filter(a->a.getConditionFlag().equals(1)
+                        &&!a.getColumnType().equals(ExlConst.TYPE_MONEY)).collect(Collectors.toList());
         List<ExlQueryFieldDto> queryFieldList = new ArrayList<>();
         for (ExlColumnConf columnConf : queryColumn) {
             if(columnConf.getColumnType().contains(ExlConst.DATE_TYPE)){

src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java

@@ -104,24 +104,33 @@ public class ExlTableDataController {
         if(!map.isEmpty()){
             for (String columnName : map.keySet()) {
                 String searchValue = map.get(columnName);
+                ExlColumnConf currColumnConf = null;
+                String orgColumn = columnName.replace(ExlConst.PRE_COLUMN_START,"")
+                        .replace(ExlConst.PRE_COLUMN_END,"").trim();
+                for (ExlColumnConf columnConf : columnList) {
+                    if(columnConf.getColumnName().equals(orgColumn)){
+                        currColumnConf = columnConf;
+                        break;
+                    }
+                }
+                if(currColumnConf==null){
+                    continue;
+                }
                 if(columnName.contains(ExlConst.PRE_COLUMN_START)){
-                    String orgColumn = columnName.replace(ExlConst.PRE_COLUMN_START,"").trim();
                     ExlConditionDto conditionDto = new ExlConditionDto(orgColumn,searchValue);
                     ge_conditions.add(conditionDto);
                 }else if (columnName.contains(ExlConst.PRE_COLUMN_END)){
-                    String orgColumn = columnName.replace(ExlConst.PRE_COLUMN_END,"").trim();
                     ExlConditionDto conditionDto = new ExlConditionDto(orgColumn,searchValue);
+                    if(currColumnConf.getColumnType().equals(ExlConst.DATETIME_TYPE)){
+                        conditionDto.setValue(searchValue+" 23:59:59");
+                    }
                     le_conditions.add(conditionDto);
                 }else {
-                    for (ExlColumnConf columnConf : columnList) {
-                        if(columnConf.getColumnName().equals(columnName)){
-                            ExlConditionDto conditionDto = new ExlConditionDto(columnName,searchValue);
-                            if (columnConf.getColumnType().equals(ExlConst.TYPE_INT)){
-                                eq_conditions.add(conditionDto);
-                            }else if (columnConf.getColumnType().equals(ExlConst.TYPE_STRING)){
-                                like_conditions.add(conditionDto);
-                            }
-                        }
+                    ExlConditionDto conditionDto = new ExlConditionDto(columnName,searchValue);
+                    if (currColumnConf.getColumnType().equals(ExlConst.TYPE_INT)){
+                        eq_conditions.add(conditionDto);
+                    }else if (currColumnConf.getColumnType().equals(ExlConst.TYPE_STRING)){
+                        like_conditions.add(conditionDto);
                     }
                 }
             }

src/main/java/com/qs/serve/modules/exl/entity/ExlTableConf.java

@@ -35,11 +35,13 @@ public class ExlTableConf implements Serializable {
     /** 表名 */
     @NotBlank(message = "表名不能为空")
     @Length(max = 255,message = "表名长度不能超过255字")
+    @TableField(condition = SqlCondition.LIKE)
     private String tableName;
 
     /** excel标题 */
     @NotBlank(message = "excel标题不能为空")
     @Length(max = 255,message = "excel标题长度不能超过255字")
+    @TableField(condition = SqlCondition.LIKE)
     private String excelTitle;
 
     /** 备注 */

src/main/java/com/qs/serve/modules/sys/entity/SysOperationManual.java

@@ -36,6 +36,7 @@ public class SysOperationManual implements Serializable {
 
     /**  */
     @Length(max = 255,message = "长度不能超过255字")
+    @TableField(condition = SqlCondition.LIKE)
     private String name;
 
     /** 附件id */

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -72,6 +72,9 @@
             <if test="query.categoryFirst != null"> and `goods_spu`.`category_first` = #{query.categoryFirst}</if>
             <if test="query.categorySecond != null"> and `goods_spu`.`category_second` = #{query.categorySecond}</if>
             <if test="query.categoryThird != null"> and `goods_spu`.`category_third` = #{query.categoryThird}</if>
+            <if test="query.cateFirstLabel != null and query.cateFirstLabel != ''"> and `cate1`.`name` like concat('%',#{query.cateFirstLabel},'%') </if>
+            <if test="query.cateSecondLabel != null and query.cateSecondLabel != ''"> and `cate2`.`name` like concat('%',#{query.cateSecondLabel},'%') </if>
+            <if test="query.cateThirdLabel != null and query.cateThirdLabel != ''"> and `cate3`.`name` like concat('%',#{query.cateThirdLabel},'%') </if>
             <if test="query.categoryLast != null"> and `goods_spu`.`category_last` = #{query.categoryLast}</if>
             <if test="query.shelf != null and query.shelf != ''"> and `goods_spu`.`shelf` = #{query.shelf}</if>
             <if test="query.sort != null"> and `goods_spu`.`sort` = #{query.sort}</if>