update

physical-launcher/src/main/resources/application-release.yml

@@ -208,7 +208,7 @@ minidao:
   base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
 jeecg:
   template:
-    path: E:\physical\templates
+    path: E:\physical-boot\templates
   # 平台上线安全配置
   firewall:
     # 数据源安全 (开启后，Online报表和图表的数据源为必填)

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java

@@ -15,6 +15,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.constant.ExperimentStatus;
 import org.jeecg.modules.database.entity.*;
@@ -25,8 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
 
 /**
  * @Description: 试验管理
@@ -83,7 +83,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
-        QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        // 自定义duoXuan字段的查询规则为：LIKE_WITH_OR
+        customeRuleMap.put("startDate", QueryRuleEnum.RIGHT_LIKE);
+        QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap(), customeRuleMap);
         Page<Experiment> page = new Page<>(pageNo, pageSize);
         IPage<Experiment> pageList = experimentService.page(page, queryWrapper);
         pageList.getRecords().forEach(v -> experimentService.fetchExperimentDetail(v));
@@ -118,7 +121,6 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         experimentLog.setCreateBy(userByName.getRealname());
         experimentLogService.save(experimentLog);
 
-
         return Result.OK("添加成功！");
     }
 

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java

@@ -83,19 +83,19 @@ public class Experiment implements Serializable {
     /**
      * 试验日期
      */
-    @Excel(name = "试验开始日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "试验开始日期", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    //@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //@DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "试验开始日期")
-    private Date                               startDate;
+    private String                               startDate;
     /**
      * 试验日期
      */
-    @Excel(name = "实验结束日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "实验结束日期", width = 20, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    //@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    //@DateTimeFormat(pattern = "yyyy-MM-dd")
     @Schema(description = "试验结束日期")
-    private Date                               endDate;
+    private String                               endDate;
     /**
      * 辐射源类型
      */