Merge remote-tracking branch 'origin/main'

src/main/java/com/zilber/boot/framework/config/SecurityConfig.java

@@ -109,7 +109,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/iconstructionreport/**","/iproductionplan/**").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js","/**/*.jpg","/**/*.png","/zilbervue/admin/", "/profile/**"
 //                        , "/vehicle/**"

src/main/java/com/zilber/boot/intelligencesite/controller/IConstructionReportController.java

@@ -3,6 +3,8 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.zilber.boot.annotation.Anonymous;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IConstructionReport;
 import com.zilber.boot.intelligencesite.service.IIConstructionReportService;
 import com.zilber.boot.utils.AjaxResult;
@@ -12,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,7 +28,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iconstructionreport")
 @Api(tags = "施工报告")
-public class IConstructionReportController {
+public class IConstructionReportController extends BaseController {
 
 
     @Resource
@@ -56,12 +59,15 @@ public class IConstructionReportController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IConstructionReport iConstructionReport) {
+        iConstructionReport.setCreateTime(new Date());
+        iConstructionReport.setCreator(getUsername());
         return AjaxResult.success(iiConstructionReportService.save(iConstructionReport));
     }
 
 
     @PutMapping("/update")
     @ApiOperation("修改")
+    @Anonymous
     public AjaxResult update(@RequestBody @Validated IConstructionReport iConstructionReport) {
         iiConstructionReportService.updateById(iConstructionReport);
         return AjaxResult.success();

src/main/java/com/zilber/boot/intelligencesite/controller/IEngineerLogController.java

@@ -3,9 +3,9 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.zilber.boot.intelligencesite.entity.IConstructionReport;
+import com.zilber.boot.annotation.Anonymous;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IEngineerLog;
-import com.zilber.boot.intelligencesite.service.IIConstructionReportService;
 import com.zilber.boot.intelligencesite.service.IIEngineerLogService;
 import com.zilber.boot.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -14,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +28,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iengineerlog")
 @Api(tags = "工程日志")
-public class IEngineerLogController {
+public class IEngineerLogController extends BaseController {
 
     @Resource
     private IIEngineerLogService iiEngineerLogService;
@@ -57,6 +58,8 @@ public class IEngineerLogController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IEngineerLog iEngineerLog) {
+        iEngineerLog.setCreateTime(new Date());
+        iEngineerLog.setCreator(getUsername());
         return AjaxResult.success(iiEngineerLogService.save(iEngineerLog));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IManpowerController.java

@@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.zilber.boot.intelligencesite.entity.IEngineerLog;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IManpower;
-import com.zilber.boot.intelligencesite.service.IIEngineerLogService;
 import com.zilber.boot.intelligencesite.service.IIManpowerService;
 import com.zilber.boot.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/imanpower")
 @Api(tags = "人力信息")
-public class IManpowerController {
+public class IManpowerController extends BaseController {
 
     @Resource
     private IIManpowerService iiManpowerService;
@@ -56,6 +56,8 @@ public class IManpowerController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IManpower iManpower) {
+        iManpower.setCreateTime(new Date());
+        iManpower.setCreator(getUsername());
         return AjaxResult.success(iiManpowerService.save(iManpower));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IMaterialsController.java

@@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.zilber.boot.intelligencesite.entity.IManpower;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IMaterials;
-import com.zilber.boot.intelligencesite.service.IIManpowerService;
 import com.zilber.boot.intelligencesite.service.IIMaterialsService;
 import com.zilber.boot.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/imaterials")
 @Api(tags = "材料信息")
-public class IMaterialsController {
+public class IMaterialsController extends BaseController {
 
     @Resource
     private IIMaterialsService iiMaterialsService;
@@ -56,6 +56,8 @@ public class IMaterialsController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IMaterials iMaterials) {
+        iMaterials.setCreateTime(new Date());
+        iMaterials.setCreator(getUsername());
         return AjaxResult.success(iiMaterialsService.save(iMaterials));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IProductionPlanController.java

@@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.zilber.boot.intelligencesite.entity.IMaterials;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IProductionPlan;
-import com.zilber.boot.intelligencesite.service.IIMaterialsService;
 import com.zilber.boot.intelligencesite.service.IIProductionPlanService;
 import com.zilber.boot.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iproductionplan")
 @Api(tags = "生产计划")
-public class IProductionPlanController {
+public class IProductionPlanController extends BaseController {
 
     @Resource
     private IIProductionPlanService iiProductionPlanService;
@@ -57,6 +57,8 @@ public class IProductionPlanController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IProductionPlan iProductionPlan) {
+        iProductionPlan.setCreateTime(new Date());
+        iProductionPlan.setCreator(getUsername());
         return AjaxResult.success(iiProductionPlanService.save(iProductionPlan));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IProgressController.java

@@ -3,6 +3,7 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IProgress;
 import com.zilber.boot.intelligencesite.service.IIProgressService;
 import com.zilber.boot.utils.AjaxResult;
@@ -12,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,7 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iprogress")
 @Api(tags = "进度跟踪")
-public class IProgressController {
+public class IProgressController extends BaseController {
 
     @Resource
     private IIProgressService iiProgressService;
@@ -55,6 +57,8 @@ public class IProgressController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IProgress iProgress) {
+        iProgress.setCreateTime(new Date());
+        iProgress.setCreator(getUsername());
         return AjaxResult.success(iiProgressService.add(iProgress));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IResourceScheduleController.java

@@ -3,6 +3,8 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.zilber.boot.annotation.Anonymous;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IResourceSchedule;
 import com.zilber.boot.intelligencesite.service.IIResourceScheduleService;
 import com.zilber.boot.utils.AjaxResult;
@@ -12,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,7 +28,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iresourceschedule")
 @Api(tags = "资源调度")
-public class IResourceScheduleController {
+public class IResourceScheduleController extends BaseController {
     @Resource
     private IIResourceScheduleService iiResourceScheduleService;
 
@@ -54,12 +57,15 @@ public class IResourceScheduleController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IResourceSchedule iResourceSchedule) {
+        iResourceSchedule.setCreateTime(new Date());
+        iResourceSchedule.setCreator(getUsername());
         return AjaxResult.success(iiResourceScheduleService.save(iResourceSchedule));
     }
 
 
     @PutMapping("/update")
     @ApiOperation("修改")
+    @Anonymous
     public AjaxResult update(@RequestBody @Validated IResourceSchedule iResourceSchedule) {
         iiResourceScheduleService.updateById(iResourceSchedule);
         return AjaxResult.success();

src/main/java/com/zilber/boot/intelligencesite/controller/ISafeController.java

@@ -3,9 +3,8 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.zilber.boot.intelligencesite.entity.IResourceSchedule;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.ISafe;
-import com.zilber.boot.intelligencesite.service.IIResourceScheduleService;
 import com.zilber.boot.intelligencesite.service.IISafeService;
 import com.zilber.boot.utils.AjaxResult;
 import io.swagger.annotations.Api;
@@ -14,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/isafe")
 @Api(tags = "安全教育")
-public class ISafeController {
+public class ISafeController extends BaseController {
 
     @Resource
     private IISafeService IISafeService;
@@ -57,6 +57,8 @@ public class ISafeController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody ISafe iSafe) {
+        iSafe.setCreateTime(new Date());
+        iSafe.setCreator(getUsername());
         return AjaxResult.success(IISafeService.save(iSafe));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IUserController.java

@@ -3,6 +3,7 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.ISafe;
 import com.zilber.boot.intelligencesite.entity.IUser;
 import com.zilber.boot.intelligencesite.service.IISafeService;
@@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iuser")
 @Api(tags = "实名制与信息管理")
-public class IUserController {
+public class IUserController extends BaseController {
 
     @Resource
     private IIUserService iiUserService;
@@ -57,6 +59,8 @@ public class IUserController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IUser iUser) {
+        iUser.setCreateTime(new Date());
+        iUser.setCreator(getUsername());
         return AjaxResult.success(iiUserService.save(iUser));
     }
 

src/main/java/com/zilber/boot/intelligencesite/controller/IWarnController.java

@@ -3,6 +3,7 @@ package com.zilber.boot.intelligencesite.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.zilber.boot.commoncontroller.BaseController;
 import com.zilber.boot.intelligencesite.entity.IUser;
 import com.zilber.boot.intelligencesite.entity.IWarn;
 import com.zilber.boot.intelligencesite.service.IIUserService;
@@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/iwarn")
 @Api(tags = "预警")
-public class IWarnController {
+public class IWarnController extends BaseController {
 
     @Resource
     private IIWarnService iiWarnService;
@@ -57,6 +59,8 @@ public class IWarnController {
     @PostMapping("/add")
     @ApiOperation("增加")
     public AjaxResult add(@RequestBody IWarn iWarn) {
+        iWarn.setCreateTime(new Date());
+        iWarn.setCreator(getUsername());
         return AjaxResult.success(iiWarnService.save(iWarn));
     }
 

src/main/java/com/zilber/boot/intelligencesite/entity/IConstructionReport.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -37,13 +38,13 @@ public class IConstructionReport implements Serializable {
     @ApiModelProperty(value = "报告日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime date;
+    private Date date;
 
     @ApiModelProperty(value = "报告周期")
     private String cycle;
 
     @ApiModelProperty(value = "计划id")
-    private Long planId;
+    private String planId;
 
     @ApiModelProperty(value = "计划名称")
     private String planName;
@@ -64,12 +65,12 @@ public class IConstructionReport implements Serializable {
     private String qs;
 
     @ApiModelProperty(value = "建议")
-    private String advise;
+    private String advises;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IEngineerLog.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -37,7 +38,7 @@ public class IEngineerLog implements Serializable {
     @ApiModelProperty(value = "日期")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime date;
+    private Date date;
 
     @ApiModelProperty(value = "天气")
     private String weather;
@@ -66,7 +67,7 @@ public class IEngineerLog implements Serializable {
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IManpower.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -53,12 +54,12 @@ public class IManpower implements Serializable {
     @ApiModelProperty(value = "预计离场时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime leaveTime;
+    private Date leaveTime;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IMaterials.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -58,17 +59,17 @@ public class IMaterials implements Serializable {
     @ApiModelProperty(value = "采购时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime purchaseTime;
+    private Date purchaseTime;
 
     @ApiModelProperty(value = "预计使用时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime planUseTime;
+    private Date planUseTime;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IProductionPlan.java

@@ -68,7 +68,7 @@ public class IProductionPlan implements Serializable {
     @ApiModelProperty(value = "关键节点时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime keystageTime;
+    private Date keystageTime;
 
     @ApiModelProperty(value = "计划负责人")
     private String principal;

src/main/java/com/zilber/boot/intelligencesite/entity/IProgress.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -49,7 +50,7 @@ public class IProgress implements Serializable {
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IResourceSchedule.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -43,17 +44,17 @@ public class IResourceSchedule implements Serializable {
     @ApiModelProperty(value = "计划开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime startTime;
+    private Date startTime;
 
     @ApiModelProperty(value = "计划结束时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime endTime;
+    private Date endTime;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;
@@ -62,7 +63,7 @@ public class IResourceSchedule implements Serializable {
     private Integer currentProgress;
 
     @ApiModelProperty(value = "建议")
-    private String advise;
+    private String advises;
 
 
 }

src/main/java/com/zilber/boot/intelligencesite/entity/ISafe.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -40,12 +41,12 @@ public class ISafe implements Serializable {
     @ApiModelProperty(value = "进项安全教育啥时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime date;
+    private Date date;
 
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IUser.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -49,7 +50,7 @@ public class IUser implements Serializable {
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/java/com/zilber/boot/intelligencesite/entity/IWarn.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -52,7 +53,7 @@ public class IWarn implements Serializable {
     @ApiModelProperty(value = "创建时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "创建人")
     private String creator;

src/main/resources/mappers/IConstructionReportMapper.xml

@@ -8,21 +8,21 @@
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="date" column="date" jdbcType="TIMESTAMP"/>
         <result property="cycle" column="cycle" jdbcType="VARCHAR"/>
-        <result property="planId" column="plan_id" jdbcType="INTEGER"/>
+        <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
         <result property="planName" column="plan_name" jdbcType="VARCHAR"/>
         <result property="totalProgress" column="total_progress" jdbcType="VARCHAR"/>
         <result property="manpower" column="manpower" jdbcType="VARCHAR"/>
         <result property="materialsUse" column="materials_use" jdbcType="VARCHAR"/>
         <result property="equipmentOperation" column="equipment_operation" jdbcType="VARCHAR"/>
         <result property="qs" column="qs" jdbcType="VARCHAR"/>
-        <result property="advise" column="advise" jdbcType="VARCHAR"/>
+        <result property="advises" column="advises" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="creator" column="creator" jdbcType="VARCHAR"/>
     </resultMap>
 
 	<sql id="selectIConstructionReportVo">
         select
-id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, equipment_operation, qs, advise, create_time, creator        from i_construction_report
+id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, equipment_operation, qs, advises, create_time, creator        from i_construction_report
     </sql>
 
 
@@ -30,21 +30,19 @@ id, date, cycle, plan_id, plan_name, total_progress, manpower, materials_use, eq
         <include refid="selectIConstructionReportVo"/>
         <where>
 			<if test="date != null"> and date=#{date}</if>
-			<if test="cycle != null and cycle != ''"> and cycle=#{cycle}</if>
-			<if test="planId != null"> and plan_id=#{planId}</if>
-			<if test="planName != null and planName != ''"> and plan_name=#{planName}</if>
-			<if test="totalProgress != null and totalProgress != ''"> and total_progress=#{totalProgress}</if>
-			<if test="manpower != null and manpower != ''"> and manpower=#{manpower}</if>
-			<if test="materialsUse != null and materialsUse != ''"> and materials_use=#{materialsUse}</if>
-			<if test="equipmentOperation != null and equipmentOperation != ''"> and equipment_operation=#{equipmentOperation}</if>
-			<if test="qs != null and qs != ''"> and qs=#{qs}</if>
-			<if test="advise != null and advise != ''"> and advise=#{advise}</if>
+			<if test="cycle != null and cycle != ''"> and cycle like concat('%', #{cycle}, '%')</if>
+			<if test="planId != null and planId != ''"> and plan_id=#{planId}</if>
+			<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
+			<if test="totalProgress != null and totalProgress != ''"> and total_progress like concat('%', #{totalProgress}, '%')</if>
+			<if test="manpower != null and manpower != ''"> and manpower like concat('%', #{manpower}, '%')</if>
+			<if test="materialsUse != null and materialsUse != ''"> and materials_use like concat('%', #{materialsUse}, '%')</if>
+			<if test="equipmentOperation != null and equipmentOperation != ''"> and equipment_operation like concat('%', #{equipmentOperation}, '%')</if>
+			<if test="qs != null and qs != ''"> and qs like concat('%', #{qs}, '%')</if>
+			<if test="advises != null and advises != ''"> and advises like concat('%', #{advises}, '%')</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
-			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
+			<if test="creator != null and creator != ''"> and creator like concat('%', #{creator}, '%')</if>
         </where>
+        order by create_time desc
     </select>
-
-
-
 </mapper>
 

src/main/resources/mappers/IEngineerLogMapper.xml

@@ -31,16 +31,17 @@ principal_tel, construction_situation, other_business, create_time, creator
         <include refid="selectIEngineerLogVo"/>
         <where>
 			<if test="date != null"> and date=#{date}</if>
-			<if test="weather!= null and weather!= ''"> and weather=#{weather}</if>
+			<if test="weather!= null and weather!= ''"> and weather like concat('%', #{weather}, '%')</if>
 			<if test="temperature != null and temperature != ''"> and temperature=#{temperature}</if>
-			<if test="wind != null and wind != ''"> and wind=#{wind}</if>
-			<if test="principalName != null and principalName != ''"> and principal_name=#{principalName}</if>
-			<if test="principalTel != null and principalTel != ''"> and principal_tel=#{principalTel}</if>
-			<if test="constructionSituation != null and constructionSituation != ''"> and construction_situation=#{constructionSituation}</if>
-			<if test="otherBusiness != null and otherBusiness != ''"> and other_business=#{otherBusiness}</if>
+			<if test="wind != null and wind != ''"> and wind like concat('%', #{wind}, '%')</if>
+			<if test="principalName != null and principalName != ''"> and principal_name like concat('%', #{principalName}, '%')</if>
+			<if test="principalTel != null and principalTel != ''"> and principal_tel like concat('%', #{principalTel}, '%')</if>
+			<if test="constructionSituation != null and constructionSituation != ''"> and construction_situation like concat('%', #{constructionSituation}, '%')</if>
+			<if test="otherBusiness != null and otherBusiness != ''"> and other_business like concat('%', #{otherBusiness}, '%')</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
-			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
+			<if test="creator != null and creator != ''"> and creator like concat('%', #{creator}, '%')</if>
         </where>
+        order by create_time desc
     </select>
 </mapper>
 

src/main/resources/mappers/IManpowerMapper.xml

@@ -24,30 +24,20 @@ id, name, work_type,
 quantity, plan_devote_time, actual_devote_time, leave_time, create_time, creator        from i_manpower
     </sql>
 
-    <!--查询单个-->
-    <select id="queryById" resultMap="IManpowerResult">
-		<include refid="selectIManpowerVo"/>
-        where id = #{id}
-    </select>
 
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.IManpower" resultMap="IManpowerResult">
         <include refid="selectIManpowerVo"/>
         <where>
-			<if test="name != null and name != ''"> and name=#{name}</if>
-			<if test="workType != null and workType != ''"> and work_type=#{workType}</if>
-			<if test="
-quantity != null"> and
-quantity=#{
-quantity}</if>
-			<if test="planDevoteTime != null"> and plan_devote_time=#{planDevoteTime}</if>
-			<if test="actualDevoteTime != null"> and actual_devote_time=#{actualDevoteTime}</if>
-			<if test="leaveTime != null"> and leave_time=#{leaveTime}</if>
+			<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+			<if test="workType != null and workType != ''"> and work_type like concat('%', #{workType}, '%')</if>
+			<if test="quantity != null"> and quantity=#{quantity}</if>
+			<if test="planDevoteTime != null"> and date_format(plan_devote_time,'%y%m%d') = date_format(#{planDevoteTime},'%y%m%d')</if>
+			<if test="actualDevoteTime != null"> and date_format(actual_devote_time,'%y%m%d') = date_format(#{actualDevoteTime},'%y%m%d')</if>
+			<if test="leaveTime != null"> and date_format(leave_time,'%y%m%d') = date_format(#{leaveTime},'%y%m%d')</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
 			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
         </where>
+        order by create_time desc
     </select>
-
-
-
 </mapper>
 

src/main/resources/mappers/IMaterialsMapper.xml

@@ -28,18 +28,19 @@ id, name, specification, unit, plan_need, actual_in, surplus, supplier_name, pur
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.IMaterials" resultMap="IMaterialsResult">
         <include refid="selectIMaterialsVo"/>
         <where>
-			<if test="name != null and name != ''"> and name=#{name}</if>
-			<if test="specification != null and specification != ''"> and specification=#{specification}</if>
-			<if test="unit != null and unit != ''"> and unit=#{unit}</if>
-			<if test="planNeed != null"> and plan_need=#{planNeed}</if>
-			<if test="actualIn != null"> and actual_in=#{actualIn}</if>
-			<if test="surplus != null"> and surplus=#{surplus}</if>
-			<if test="supplierName != null and supplierName != ''"> and supplier_name=#{supplierName}</if>
+			<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+			<if test="specification != null and specification != ''"> and specification like concat('%', #{specification}, '%')</if>
+			<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+			<if test="planNeed != null"> and plan_need like concat('%', #{planNeed}, '%')</if>
+			<if test="actualIn != null"> and actual_in like concat('%', #{actualIn}, '%')</if>
+			<if test="surplus != null"> and surplus like concat('%', #{surplus}, '%')</if>
+			<if test="supplierName != null and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
 			<if test="purchaseTime != null"> and purchase_time=#{purchaseTime}</if>
 			<if test="planUseTime != null"> and plan_use_time=#{planUseTime}</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
 			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
         </where>
+        order by create_time desc
     </select>
 
 

src/main/resources/mappers/IProductionPlanMapper.xml

@@ -28,20 +28,18 @@ id, plan_name, project_stage, description, start_time, end_time, create_time, cr
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.IProductionPlan" resultMap="IProductionPlanResult">
         <include refid="selectIProductionPlanVo"/>
         <where>
-			<if test="planName != null and planName != ''"> and plan_name=#{planName}</if>
-			<if test="projectStage != null and projectStage != ''"> and project_stage=#{projectStage}</if>
-			<if test="description != null and description != ''"> and description=#{description}</if>
+			<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
+			<if test="projectStage != null and projectStage != ''"> and project_stage like concat('%', #{projectStage}, '%')</if>
+			<if test="description != null and description != ''"> and description like concat('%', #{description}, '%')</if>
 			<if test="startTime != null"> and start_time=#{startTime}</if>
 			<if test="endTime != null"> and end_time=#{endTime}</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
 			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
-			<if test="duration != null"> and duration=#{duration}</if>
-			<if test="keystageTime != null"> and keystage_time=#{keystageTime}</if>
-			<if test="principal != null and principal != ''"> and principal=#{principal}</if>
+			<if test="duration != null"> and duration like concat('%', #{duration}, '%')</if>
+			<if test="keystageTime != null"> and keystage_time =#{keystageTime}</if>
+			<if test="principal != null and principal != ''"> and principal like concat('%', #{principal}, '%')</if>
         </where>
+        order by create_time desc
     </select>
-
-
-
 </mapper>
 

src/main/resources/mappers/IProgressMapper.xml

@@ -19,25 +19,17 @@
 id, plan_id, plan_name, day_progress, accumulative_progress, create_time, creator        from i_progress
     </sql>
 
-    <!--查询单个-->
-    <select id="queryById" resultMap="IProgressResult">
-		<include refid="selectIProgressVo"/>
-        where id = #{id}
-    </select>
-
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.IProgress" resultMap="IProgressResult">
         <include refid="selectIProgressVo"/>
         <where>
 			<if test="planId != null"> and plan_id=#{planId}</if>
-			<if test="planName != null and planName != ''"> and plan_name=#{planName}</if>
-			<if test="dayProgress != null"> and day_progress=#{dayProgress}</if>
-			<if test="accumulativeProgress != null"> and accumulative_progress=#{accumulativeProgress}</if>
+			<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
+			<if test="dayProgress != null"> and day_progress  like concat('%', #{dayProgress}, '%')</if>
+			<if test="accumulativeProgress != null"> and accumulative_progress like concat('%', #{accumulativeProgress}, '%')</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
 			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
         </where>
+        order by create_time desc
     </select>
-
-
-
 </mapper>
 

src/main/resources/mappers/IResourceScheduleMapper.xml

@@ -13,28 +13,27 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="creator" column="creator" jdbcType="VARCHAR"/>
         <result property="currentProgress" column="current_progress" jdbcType="INTEGER"/>
-        <result property="advise" column="advise" jdbcType="VARCHAR"/>
+        <result property="advises" column="advises" jdbcType="VARCHAR"/>
     </resultMap>
 
 	<sql id="selectIResourceScheduleVo">
         select
-id, plan_id, plan_name, start_time, end_time, create_time, creator, current_progress, advise        from i_resource_schedule
+id, plan_id, plan_name, start_time, end_time, create_time, creator, current_progress, advises        from i_resource_schedule
     </sql>
 
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.IResourceSchedule" resultMap="IResourceScheduleResult">
         <include refid="selectIResourceScheduleVo"/>
         <where>
 			<if test="planId != null"> and plan_id=#{planId}</if>
-			<if test="planName != null and planName != ''"> and plan_name=#{planName}</if>
+			<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
 			<if test="startTime != null"> and start_time=#{startTime}</if>
 			<if test="endTime != null"> and end_time=#{endTime}</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
 			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
 			<if test="currentProgress != null"> and current_progress=#{currentProgress}</if>
-			<if test="advise != null and advise != ''"> and advise=#{advise}</if>
+			<if test="advises != null and advises != ''"> and advises=#{advises}</if>
         </where>
+        order by create_time desc
     </select>
-
-
 </mapper>
 

src/main/resources/mappers/ISafeMapper.xml

@@ -21,13 +21,12 @@ id, name, date, create_time, creator        from i_safe
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.ISafe" resultMap="ISafeResult">
         <include refid="selectISafeVo"/>
         <where>
-			<if test="name != null and name != ''"> and name=#{name}</if>
+			<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
 			<if test="date != null"> and date=#{date}</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
-			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
+			<if test="creator != null and creator != ''"> and creator like concat('%', #{creator}, '%')</if>
         </where>
+        order by create_time desc
     </select>
-
-
 </mapper>
 

src/main/resources/mappers/IUserMapper.xml

@@ -23,13 +23,14 @@ id, name, tel, id_card, work_type, create_time, creator        from i_user
 	<select id="queryList" parameterType="com.zilber.boot.intelligencesite.entity.IUser" resultMap="IUserResult">
         <include refid="selectIUserVo"/>
         <where>
-			<if test="name != null and name != ''"> and name=#{name}</if>
-			<if test="tel != null and tel != ''"> and tel=#{tel}</if>
-			<if test="idCard != null and idCard != ''"> and id_card=#{idCard}</if>
-			<if test="workType != null and workType != ''"> and work_type=#{workType}</if>
+			<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+			<if test="tel != null and tel != ''"> and tel like concat('%', #{tel}, '%')</if>
+			<if test="idCard != null and idCard != ''"> and id_card like concat('%', #{idCard}, '%')</if>
+			<if test="workType != null and workType != ''"> and work_type like concat('%', #{workType}, '%')</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
-			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
+			<if test="creator != null and creator != ''"> and creator like concat('%', #{creator}, '%')</if>
         </where>
+        order by create_time desc
     </select>
 
 

src/main/resources/mappers/IWarnMapper.xml

@@ -25,15 +25,14 @@ id, plan_id, plan_name, deviation_type, deviation_days, warn_info, create_time,
         <include refid="selectIWarnVo"/>
         <where>
 			<if test="planId != null"> and plan_id=#{planId}</if>
-			<if test="planName != null and planName != ''"> and plan_name=#{planName}</if>
-			<if test="deviationType != null"> and deviation_type=#{deviationType}</if>
-			<if test="deviationDays != null"> and deviation_days=#{deviationDays}</if>
-			<if test="warnInfo != null and warnInfo != ''"> and warn_info=#{warnInfo}</if>
+			<if test="planName != null and planName != ''"> and plan_name like concat('%', #{planName}, '%')</if>
+			<if test="deviationType != null"> and deviation_type like concat('%', #{deviationType}, '%')</if>
+			<if test="deviationDays != null"> and deviation_days like concat('%', #{deviationDays}, '%')</if>
+			<if test="warnInfo != null and warnInfo != ''"> and warn_info like concat('%', #{warnInfo}, '%')</if>
 			<if test="createTime != null"> and create_time=#{createTime}</if>
-			<if test="creator != null and creator != ''"> and creator=#{creator}</if>
+			<if test="creator != null and creator != ''"> and creator like concat('%', #{creator}, '%')</if>
         </where>
+        order by create_time desc
     </select>
-
-
 </mapper>