Merge remote-tracking branch 'origin/skyp_Api_Hunan' into skyp_Api_Hunan

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/CodeYymc/SkCodeYymc.java

@@ -128,6 +128,14 @@ public class SkCodeYymc implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-ss HH:mm:ss")
     private Date gxsj;
 
+    @ApiModelProperty(value = "开始时间")
+    @TableField(exist = false)
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField(exist = false)
+    private String endTime;
+
 
     @ApiModelProperty(value = "当前第几页")
     @TableField(exist = false)

common/service_base/src/main/java/com/founder/servicebase/controller/CodeYymcController/CodeYymcController.java

 package com.founder.servicebase.controller.CodeYymcController;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -63,6 +64,7 @@ public class CodeYymcController {
         }
         skCodeYymc.setId(KeyUtilNaotu.getJzKey1("cd"));
         skCodeYymc.setLrsj(new Date());
+        skCodeYymc.setGxsj(new Date());
         int insert = codeYymcMapper.insert(skCodeYymc);
         if (insert > 0){
             return new MapRestResult(200,"新增成功", skCodeYymc);
@@ -135,6 +137,14 @@ public class CodeYymcController {
         //级别
         wrapper.eq(StringUtils.isNotEmpty(skCodeYymc.getLev()),"lev", skCodeYymc.getLev());
 
+        if (ObjectUtil.isNotNull( skCodeYymc.getStartTime()) && ObjectUtil.isNotNull(skCodeYymc.getEndTime())) {
+            wrapper.apply("gxsj between'" +  skCodeYymc.getStartTime().toString() + "' and '" + skCodeYymc.getEndTime().toString() +"'" );
+        } else if (ObjectUtil.isNotNull( skCodeYymc.getStartTime())) {
+            wrapper.apply("gxsj >= '" + skCodeYymc.getStartTime().toString() +"'" );
+        } else if (ObjectUtil.isNotNull(skCodeYymc.getEndTime())) {
+            wrapper.apply("gxsj <= '" + skCodeYymc.getEndTime().toString() +"'" );
+        }
+
         wrapper.eq("is_deleted","0");
         IPage iPage = codeYymcMapper.selectPage(new Page(skCodeYymc.getPage(), skCodeYymc.getLimit()), wrapper);