项目进度上报，邮件调整

src/main/java/com/zhgd/xmgl/async/AsyncEmail.java

@@ -26,10 +26,14 @@ public class AsyncEmail {
      */
     @Async("taskExecutor")
     public void sendEmail(String sn, String receiveUser, String title, String content) {
-        GovernmentConfig governmentConfig = governmentConfigService.getOne(Wrappers.<GovernmentConfig>lambdaQuery().eq(GovernmentConfig::getGovernmentSn, sn)
+        try {
-                .eq(GovernmentConfig::getKey, ParamEnum.GovernmentConfig.EMAIL.getValue()));
+            GovernmentConfig governmentConfig = governmentConfigService.getOne(Wrappers.<GovernmentConfig>lambdaQuery().eq(GovernmentConfig::getGovernmentSn, sn)
-        if (governmentConfig != null && StringUtils.isNotBlank(governmentConfig.getValue())) {
+                    .eq(GovernmentConfig::getConfigKey, ParamEnum.GovernmentConfig.EMAIL.getValue()));
-            EmailsUtil.send(governmentConfig.getValue(), receiveUser, title, content);
+            if (governmentConfig != null && StringUtils.isNotBlank(governmentConfig.getValue())) {
+                EmailsUtil.send(governmentConfig.getValue(), receiveUser, title, content);
+            }
+        } catch (Exception e){
+            e.printStackTrace();
         }
     }
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserAuthController.java

@@ -194,7 +194,6 @@ public class SystemUserAuthController {
 		}
 	}
 
-
 	@Operation(summary = "检查用户登录信息", description = "验证token的有效性", tags = {"user"})
 	@GetMapping("/checkuserlogininfo")
 	public RestResult<UserLoginVo> checkUserLoginInfo(HttpServletRequest request) {

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntEngineeringController.java

@@ -114,4 +114,26 @@ public class EntEngineeringController {
     public Result<List<EngineeringSingle>> querySingle(@ApiIgnore @RequestBody Engineering engineeringEntity) {
         return Result.success(engineeringService.querySingle(engineeringEntity));
     }
+
+    /**
+     *  修正定位
+     * @param engineering
+     * @return
+     */
+    @OperLog(operModul = "工程管理", operType = "编辑", operDesc = "修正定位")
+    @ApiOperation(value = "修正定位", notes = "修正定位" , httpMethod="POST")
+    @PostMapping(value = "/editPosition")
+    public Result<Engineering> editPosition(@RequestBody Engineering engineering) {
+        Result<Engineering> result = new Result<Engineering>();
+        Engineering engineeringEntity = engineeringService.getById(engineering.getId());
+        if(engineeringEntity==null) {
+            result.error500("未找到对应实体");
+        }else {
+            boolean ok = engineeringService.updatePosition(engineering);
+            if(ok) {
+                result.success("修改成功!");
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntProgressReportRecordController.java

@@ -0,0 +1,136 @@
+package com.zhgd.xmgl.modules.basicdata.controller.enterprise;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.OperLog;
+import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Title: Controller
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date： 2023-09-11
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/ent/progressReportRecord")
+@Slf4j
+@Api(tags = "工程进度上报记录管理")
+public class EntProgressReportRecordController {
+    @Autowired
+    private IProgressReportRecordService progressReportRecordService;
+
+    /**
+     * 分页列表查询
+     *
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "分页查询", operDesc = "分页列表查询工程进度上报记录信息")
+    @ApiOperation(value = " 分页列表查询工程进度上报记录信息", notes = "分页列表查询工程进度上报记录信息", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "current", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"),
+            @ApiImplicitParam(name = "size", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer")
+    })
+    @PostMapping(value = "/page")
+    public Result<IPage<ProgressReportRecord>> queryPageList(Page page, @ApiIgnore @RequestBody Map<String, Object> map) {
+        QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
+        IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
+        return Result.success(pageList);
+    }
+
+    /**
+     * 列表查询
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "列表查询", operDesc = "列表查询工程进度上报记录信息")
+    @ApiOperation(value = " 列表查询工程进度上报记录信息", notes = "列表查询工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/list")
+    public Result<List<ProgressReportRecord>> queryList(@RequestBody ProgressReportRecord progressReportRecord) {
+        QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initQueryWrapper(progressReportRecord);
+        List<ProgressReportRecord> list = progressReportRecordService.list(queryWrapper);
+        return Result.success(list);
+    }
+
+
+    /**
+     * 添加
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "新增", operDesc = "添加工程进度上报记录信息")
+    @ApiOperation(value = " 添加工程进度上报记录信息", notes = "添加工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/add")
+    public Result<Object> add(@RequestBody ProgressReportRecord progressReportRecord) {
+        progressReportRecordService.save(progressReportRecord);
+        return Result.success("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "修改", operDesc = "编辑工程进度上报记录信息")
+    @ApiOperation(value = "编辑工程进度上报记录信息", notes = "编辑工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/edit")
+    public Result<ProgressReportRecord> edit(@RequestBody ProgressReportRecord progressReportRecord) {
+        Result<ProgressReportRecord> result = new Result<ProgressReportRecord>();
+        ProgressReportRecord progressReportRecordEntity = progressReportRecordService.getById(progressReportRecord.getId());
+        if (progressReportRecordEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = progressReportRecordService.updateById(progressReportRecord);
+            if (ok) {
+                result.success("修改成功!");
+            } else {
+                result.success("操作失败!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "查询", operDesc = "通过id查询工程进度上报记录信息")
+    @ApiOperation(value = "通过id查询工程进度上报记录信息", notes = "通过id查询工程进度上报记录信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "id", value = "工程进度上报记录ID", paramType = "body", required = true, dataType = "Integer")
+    @PostMapping(value = "/queryById")
+    public Result<ProgressReportRecord> queryById(@ApiIgnore @RequestBody ProgressReportRecord progressReportRecordVo) {
+        Result<ProgressReportRecord> result = new Result<ProgressReportRecord>();
+        ProgressReportRecord progressReportRecord = progressReportRecordService.getById(progressReportRecordVo.getId());
+        if (progressReportRecord == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(progressReportRecord);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovLiftingDeviceController.java

@@ -59,8 +59,8 @@ public class GovLiftingDeviceController {
             @ApiImplicitParam(name = "enterpriseName", value = "产权单位", paramType = "body", dataType = "String"),
             @ApiImplicitParam(name = "type", value = "设备类型", paramType = "body", dataType = "Integer"),
             @ApiImplicitParam(name = "equipmentUse", value = "设备使用状态", paramType = "body", dataType = "Integer"),
-            @ApiImplicitParam(name = "createTime_begin", value = "提交开始时间", paramType = "body", dataType = "String"),
+            @ApiImplicitParam(name = "examineTime_begin", value = "给号开始时间", paramType = "body", dataType = "String"),
-            @ApiImplicitParam(name = "createTime_end", value = "提交结束时间", paramType = "body", dataType = "String")
+            @ApiImplicitParam(name = "examineTime_end", value = "给号结束时间", paramType = "body", dataType = "String")
     })
     @PostMapping(value = "/page")
     public Result<IPage<LiftingDevice>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProgressReportRecordController.java

@@ -0,0 +1,136 @@
+package com.zhgd.xmgl.modules.basicdata.controller.government;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.OperLog;
+import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Title: Controller
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date： 2023-09-11
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/gov/progressReportRecord")
+@Slf4j
+@Api(tags = "工程进度上报记录管理")
+public class GovProgressReportRecordController {
+    @Autowired
+    private IProgressReportRecordService progressReportRecordService;
+
+    /**
+     * 分页列表查询
+     *
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "分页查询", operDesc = "分页列表查询工程进度上报记录信息")
+    @ApiOperation(value = " 分页列表查询工程进度上报记录信息", notes = "分页列表查询工程进度上报记录信息", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "current", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"),
+            @ApiImplicitParam(name = "size", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer")
+    })
+    @PostMapping(value = "/page")
+    public Result<IPage<ProgressReportRecord>> queryPageList(Page page, @ApiIgnore @RequestBody Map<String, Object> map) {
+        QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
+        IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
+        return Result.success(pageList);
+    }
+
+    /**
+     * 列表查询
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "列表查询", operDesc = "列表查询工程进度上报记录信息")
+    @ApiOperation(value = " 列表查询工程进度上报记录信息", notes = "列表查询工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/list")
+    public Result<List<ProgressReportRecord>> queryList(@RequestBody ProgressReportRecord progressReportRecord) {
+        QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initQueryWrapper(progressReportRecord);
+        List<ProgressReportRecord> list = progressReportRecordService.list(queryWrapper);
+        return Result.success(list);
+    }
+
+
+    /**
+     * 添加
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "新增", operDesc = "添加工程进度上报记录信息")
+    @ApiOperation(value = " 添加工程进度上报记录信息", notes = "添加工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/add")
+    public Result<Object> add(@RequestBody ProgressReportRecord progressReportRecord) {
+        progressReportRecordService.save(progressReportRecord);
+        return Result.success("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "修改", operDesc = "编辑工程进度上报记录信息")
+    @ApiOperation(value = "编辑工程进度上报记录信息", notes = "编辑工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/edit")
+    public Result<ProgressReportRecord> edit(@RequestBody ProgressReportRecord progressReportRecord) {
+        Result<ProgressReportRecord> result = new Result<ProgressReportRecord>();
+        ProgressReportRecord progressReportRecordEntity = progressReportRecordService.getById(progressReportRecord.getId());
+        if (progressReportRecordEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = progressReportRecordService.updateById(progressReportRecord);
+            if (ok) {
+                result.success("修改成功!");
+            } else {
+                result.success("操作失败!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "查询", operDesc = "通过id查询工程进度上报记录信息")
+    @ApiOperation(value = "通过id查询工程进度上报记录信息", notes = "通过id查询工程进度上报记录信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "id", value = "工程进度上报记录ID", paramType = "body", required = true, dataType = "Integer")
+    @PostMapping(value = "/queryById")
+    public Result<ProgressReportRecord> queryById(@ApiIgnore @RequestBody ProgressReportRecord progressReportRecordVo) {
+        Result<ProgressReportRecord> result = new Result<ProgressReportRecord>();
+        ProgressReportRecord progressReportRecord = progressReportRecordService.getById(progressReportRecordVo.getId());
+        if (progressReportRecord == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(progressReportRecord);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectController.java

@@ -3,14 +3,14 @@ package com.zhgd.xmgl.modules.basicdata.controller.government;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
-import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto;
 import com.zhgd.xmgl.modules.basicdata.dto.ProjectDto;
-import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto;
 import com.zhgd.xmgl.modules.basicdata.entity.Enterprise;
 import com.zhgd.xmgl.modules.basicdata.entity.Project;
+import com.zhgd.xmgl.modules.basicdata.service.IProjectService;
+import com.zhgd.xmgl.modules.wisdom.dto.MapAiAlarmDto;
+import com.zhgd.xmgl.modules.wisdom.dto.MapEnvironAlarmDto;
 import com.zhgd.xmgl.modules.wisdom.service.IAiMonitorAlarmService;
 import com.zhgd.xmgl.modules.wisdom.service.IEnvironmentAlarmService;
-import com.zhgd.xmgl.modules.basicdata.service.IProjectService;
 import com.zhgd.xmgl.security.SecurityUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -172,4 +172,26 @@ public class GovProjectController {
         }
         return result;
     }
+
+    /**
+     *  修正定位
+     * @param project
+     * @return
+     */
+    @OperLog(operModul = "工程管理", operType = "编辑", operDesc = "修正定位")
+    @ApiOperation(value = "修正定位", notes = "修正定位" , httpMethod="POST")
+    @PostMapping(value = "/editPosition")
+    public Result<Project> editPosition(@RequestBody Project project) {
+        Result<Project> result = new Result<Project>();
+        Project projectEntity = projectService.getById(project.getProjectId());
+        if(projectEntity==null) {
+            result.error500("未找到对应实体");
+        }else {
+            boolean ok = projectService.updatePosition(project);
+            if(ok) {
+                result.success("修改成功!");
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/DangerousEngineeringController.java

@@ -175,7 +175,7 @@ public class DangerousEngineeringController {
     @OperLog(operModul = "危大工程管理", operType = "查询", operDesc = "危大工程统计信息")
     @ApiOperation(value = "危大工程统计信息", notes = "危大工程统计信息", httpMethod = "POST")
     @PostMapping(value = "/stat")
-    public Result<DangerousEngineeringStat> stat(@ApiIgnore @RequestBody DangerousEngineering dangerousEngineering) {
+    public Result<DangerousEngineeringStat> stat(@RequestBody DangerousEngineering dangerousEngineering) {
         QueryWrapper<DangerousEngineering> queryWrapper = QueryGenerator.initQueryWrapper(dangerousEngineering);
         if (StringUtils.isNotBlank(dangerousEngineering.getProjectSn())) {
             queryWrapper.lambda().eq(DangerousEngineering::getEngineeringSn, StrUtil.EMPTY);

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/EngineeringController.java

@@ -179,4 +179,26 @@ public class EngineeringController {
     public Result<List<EngineeringSingle>> querySingle(@ApiIgnore @RequestBody Engineering engineeringEntity) {
         return Result.success(engineeringService.querySingle(engineeringEntity));
     }
+
+    /**
+     *  修正定位
+     * @param engineering
+     * @return
+     */
+    @OperLog(operModul = "工程管理", operType = "编辑", operDesc = "修正定位")
+    @ApiOperation(value = "修正定位", notes = "修正定位" , httpMethod="POST")
+    @PostMapping(value = "/editPosition")
+    public Result<Engineering> editPosition(@RequestBody Engineering engineering) {
+        Result<Engineering> result = new Result<Engineering>();
+        Engineering engineeringEntity = engineeringService.getById(engineering.getId());
+        if(engineeringEntity==null) {
+            result.error500("未找到对应实体");
+        }else {
+            boolean ok = engineeringService.updatePosition(engineering);
+            if(ok) {
+                result.success("修改成功!");
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProgressReportRecordController.java

@@ -0,0 +1,136 @@
+package com.zhgd.xmgl.modules.basicdata.controller.project;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zhgd.annotation.OperLog;
+import com.zhgd.jeecg.common.api.vo.Result;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * @Title: Controller
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date： 2023-09-11
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/project/progressReportRecord")
+@Slf4j
+@Api(tags = "工程进度上报记录管理")
+public class ProgressReportRecordController {
+    @Autowired
+    private IProgressReportRecordService progressReportRecordService;
+
+    /**
+     * 分页列表查询
+     *
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "分页查询", operDesc = "分页列表查询工程进度上报记录信息")
+    @ApiOperation(value = " 分页列表查询工程进度上报记录信息", notes = "分页列表查询工程进度上报记录信息", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "current", value = "页数", paramType = "query", required = true, defaultValue = "1", dataType = "Integer"),
+            @ApiImplicitParam(name = "size", value = "每页条数", paramType = "query", required = true, defaultValue = "10", dataType = "Integer")
+    })
+    @PostMapping(value = "/page")
+    public Result<IPage<ProgressReportRecord>> queryPageList(Page page, @ApiIgnore @RequestBody Map<String, Object> map) {
+        QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(ProgressReportRecord.class, map);
+        IPage<ProgressReportRecord> pageList = progressReportRecordService.page(page, queryWrapper);
+        return Result.success(pageList);
+    }
+
+    /**
+     * 列表查询
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "列表查询", operDesc = "列表查询工程进度上报记录信息")
+    @ApiOperation(value = " 列表查询工程进度上报记录信息", notes = "列表查询工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/list")
+    public Result<List<ProgressReportRecord>> queryList(@RequestBody ProgressReportRecord progressReportRecord) {
+        QueryWrapper<ProgressReportRecord> queryWrapper = QueryGenerator.initQueryWrapper(progressReportRecord);
+        List<ProgressReportRecord> list = progressReportRecordService.list(queryWrapper);
+        return Result.success(list);
+    }
+
+
+    /**
+     * 添加
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "新增", operDesc = "添加工程进度上报记录信息")
+    @ApiOperation(value = " 添加工程进度上报记录信息", notes = "添加工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/add")
+    public Result<Object> add(@RequestBody ProgressReportRecord progressReportRecord) {
+        progressReportRecordService.save(progressReportRecord);
+        return Result.success("添加成功！");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param progressReportRecord
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "修改", operDesc = "编辑工程进度上报记录信息")
+    @ApiOperation(value = "编辑工程进度上报记录信息", notes = "编辑工程进度上报记录信息", httpMethod = "POST")
+    @PostMapping(value = "/edit")
+    public Result<ProgressReportRecord> edit(@RequestBody ProgressReportRecord progressReportRecord) {
+        Result<ProgressReportRecord> result = new Result<ProgressReportRecord>();
+        ProgressReportRecord progressReportRecordEntity = progressReportRecordService.getById(progressReportRecord.getId());
+        if (progressReportRecordEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = progressReportRecordService.updateById(progressReportRecord);
+            if (ok) {
+                result.success("修改成功!");
+            } else {
+                result.success("操作失败!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @return
+     */
+    @OperLog(operModul = "工程进度上报记录管理", operType = "查询", operDesc = "通过id查询工程进度上报记录信息")
+    @ApiOperation(value = "通过id查询工程进度上报记录信息", notes = "通过id查询工程进度上报记录信息", httpMethod = "POST")
+    @ApiImplicitParam(name = "id", value = "工程进度上报记录ID", paramType = "body", required = true, dataType = "Integer")
+    @PostMapping(value = "/queryById")
+    public Result<ProgressReportRecord> queryById(@ApiIgnore @RequestBody ProgressReportRecord progressReportRecordVo) {
+        Result<ProgressReportRecord> result = new Result<ProgressReportRecord>();
+        ProgressReportRecord progressReportRecord = progressReportRecordService.getById(progressReportRecordVo.getId());
+        if (progressReportRecord == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(progressReportRecord);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+}

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/ProjectController.java

@@ -184,4 +184,26 @@ public class ProjectController {
         }
         return result;
     }
+
+    /**
+     *  修正定位
+     * @param project
+     * @return
+     */
+    @OperLog(operModul = "工程管理", operType = "编辑", operDesc = "修正定位")
+    @ApiOperation(value = "修正定位", notes = "修正定位" , httpMethod="POST")
+    @PostMapping(value = "/editPosition")
+    public Result<Project> editPosition(@RequestBody Project project) {
+        Result<Project> result = new Result<Project>();
+        Project projectEntity = projectService.getById(project.getProjectId());
+        if(projectEntity==null) {
+            result.error500("未找到对应实体");
+        }else {
+            boolean ok = projectService.updatePosition(project);
+            if(ok) {
+                result.success("修改成功!");
+            }
+        }
+        return result;
+    }
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/entity/GovernmentConfig.java

@@ -39,7 +39,7 @@ public class GovernmentConfig implements Serializable {
      */
     @Excel(name = "配置键名", width = 15)
     @ApiModelProperty(value = "配置键名")
-    private String key;
+    private String configKey;
     /**
      * 配置值
      */

src/main/java/com/zhgd/xmgl/modules/basicdata/service/IProjectService.java

@@ -31,4 +31,6 @@ public interface IProjectService extends IService<Project> {
     List<String> getSnListForGov(String governmentSn);
 
     Page<ProjectPageDto> pageListForGov(Map<String, Object> map);
+
+    boolean updatePosition(Project project);
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/ProjectServiceImpl.java

@@ -150,4 +150,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         Page<Project> page = PageUtil.getPage(map);
         return baseMapper.pageListByGov(page, wrapper);
     }
+
+    @Override
+    public boolean updatePosition(Project project) {
+        LambdaUpdateWrapper<Project> wrapper = Wrappers.<Project>lambdaUpdate();
+        wrapper.set(Project::getLatitude, project.getLatitude());
+        wrapper.set(Project::getProjectAddress, project.getProjectAddress());
+        wrapper.set(Project::getLongitude, project.getLongitude());
+        wrapper.eq(Project::getProjectId, project.getProjectId());
+        return this.update(wrapper);
+    }
 }

src/main/java/com/zhgd/xmgl/modules/quality/entity/MonthlyReport.java

@@ -41,9 +41,9 @@ public class MonthlyReport 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")
     @ApiModelProperty(value = "完成时间")
     private Date completeTime;
     /**

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/AcceptInspectRecordServiceImpl.java

@@ -71,7 +71,6 @@ public class AcceptInspectRecordServiceImpl extends ServiceImpl<AcceptInspectRec
 
     @Override
     public Page<AcceptInspectRecordDto> pageList(Page page, QueryWrapper<AcceptInspectRecord> wrapper) {
-        wrapper.lambda().orderByAsc(AcceptInspectRecord::getState);
         wrapper.lambda().orderByDesc(AcceptInspectRecord::getCreateTime);
         Page<AcceptInspectRecordDto> inspectRecordDtoPage = baseMapper.pageList(page, wrapper);
         inspectRecordDtoPage.getRecords().forEach(i -> {

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/MonthlyReportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.quality.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -50,6 +52,7 @@ public class MonthlyReportServiceImpl extends ServiceImpl<MonthlyReportMapper, M
     @Override
     public boolean saveInfo(MonthlyReport monthlyReport) {
         monthlyReport.setCreateBy(SecurityUtil.getUser().getUserId());
+        monthlyReport.setYear(DateUtil.year(new Date()));
         return this.save(monthlyReport);
     }
 

src/main/java/com/zhgd/xmgl/modules/safety/entity/ProgressReportRecord.java

@@ -0,0 +1,66 @@
+package com.zhgd.xmgl.modules.safety.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date： 2023-09-11
+ * @version： V1.0
+ */
+@Data
+@TableName("progress_report_record")
+@ApiModel(value = "ProgressReportRecord实体类", description = "ProgressReportRecord")
+public class ProgressReportRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 进度上报ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "进度上报ID")
+    private Long id;
+    /**
+     * 项目/工程SN
+     */
+    @Excel(name = "项目/工程SN", width = 15)
+    @ApiModelProperty(value = "项目/工程SN")
+    private String relevanceSn;
+    /**
+     * 项目/工程状态
+     */
+    @Excel(name = "项目/工程状态", width = 15)
+    @ApiModelProperty(value = "项目/工程状态")
+    private Integer state;
+    /**
+     * 形象进度
+     */
+    @Excel(name = "形象进度", width = 15)
+    @ApiModelProperty(value = "形象进度")
+    private String progress;
+    /**
+     * 备注
+     */
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 更新日期
+     */
+    @Excel(name = "更新日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "更新日期")
+    private Date reportTime;
+}

src/main/java/com/zhgd/xmgl/modules/safety/mapper/ProgressReportRecordMapper.java

@@ -0,0 +1,16 @@
+package com.zhgd.xmgl.modules.safety.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date：   2023-09-11
+ * @version： V1.0
+ */
+@Mapper
+public interface ProgressReportRecordMapper extends BaseMapper<ProgressReportRecord> {
+
+}

src/main/java/com/zhgd/xmgl/modules/safety/mapper/xml/ProgressReportRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhgd.xmgl.modules.safety.mapper.ProgressReportRecordMapper">
+
+</mapper>

src/main/java/com/zhgd/xmgl/modules/safety/service/IProgressReportRecordService.java

@@ -0,0 +1,14 @@
+package com.zhgd.xmgl.modules.safety.service;
+
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date：   2023-09-11
+ * @version： V1.0
+ */
+public interface IProgressReportRecordService extends IService<ProgressReportRecord> {
+
+}

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/DangerousEngineeringServiceImpl.java

@@ -86,7 +86,7 @@ public class DangerousEngineeringServiceImpl extends ServiceImpl<DangerousEngine
         DangerousEngineeringStat dangerousEngineeringStat = new DangerousEngineeringStat();
         dangerousEngineeringStat.setBuilding(list.stream().filter(l -> DateUtil.compare(l.getConstructionStartTime(), new Date()) < 0 &&
                 DateUtil.compare(l.getConstructionEndTime(), new Date()) > 0).collect(Collectors.toList()).size());
-        dangerousEngineeringStat.setSiteNum(0);
+        dangerousEngineeringStat.setSiteNum(list.stream().map(l -> l.getConstructionLocation()).distinct().collect(Collectors.toList()).size());
         dangerousEngineeringStat.setCheckNumber(engineeringCheckAccepts.size());
         dangerousEngineeringStat.setQuestionNum(engineeringCheckAccepts.stream().filter(e -> e.getQuestion() != 0).collect(Collectors.toList()).size());
         BigDecimal checkNum = new BigDecimal(engineeringCheckAccepts.size());

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceServiceImpl.java

@@ -240,7 +240,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
         Long idss = liftingDevice.getId();
         if (liftingDevice.getType() == 1) {
             // 长期和零时the_nature
-            if ("2".equals(liftingDevice.getTheNature())) {
+            if (2 == liftingDevice.getTheNature()) {
                 // 零时
                 // 2：市直S塔式起重机T
                 String pj = "KS-T";
@@ -254,7 +254,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
             }
         }
         if (liftingDevice.getType() == 2) {
-            if ("2".equals(liftingDevice.getTheNature())) {
+            if (2 == liftingDevice.getTheNature()) {
                 // 零时
                 // 2：市直S物料提升机W
                 String pj = "KS-W";
@@ -268,7 +268,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
             }
         }
         if (liftingDevice.getType() == 3) {
-            if ("2".equals(liftingDevice.getTheNature())) {
+            if (2 == liftingDevice.getTheNature()) {
                 // 零时
                 // 2：市直S施工升降机S
                 String pj = "KS-S";
@@ -282,7 +282,7 @@ public class LiftingDeviceServiceImpl extends ServiceImpl<LiftingDeviceMapper, L
             }
         }
         if (liftingDevice.getType() == 4) {
-            if ("2".equals(liftingDevice.getTheNature())) {
+            if (2 == liftingDevice.getTheNature()) {
                 // 零时
                 // 2：市直S高出作业吊篮D
                 String pj = "KS-D";

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/LiftingDeviceUseServiceImpl.java

@@ -20,7 +20,7 @@ public class LiftingDeviceUseServiceImpl extends ServiceImpl<LiftingDeviceUseMap
 
     @Override
     public Page<LiftingDeviceUse> pageList(Page page, QueryWrapper<LiftingDeviceUse> wrapper) {
-        wrapper.lambda().orderByDesc(LiftingDeviceUse::getAddTime);
+        wrapper.lambda().orderByDesc(LiftingDeviceUse::getAddUpdate);
         return baseMapper.selectPage(page, wrapper);
     }
 }

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProgressReportRecordServiceImpl.java

@@ -0,0 +1,19 @@
+package com.zhgd.xmgl.modules.safety.service.impl;
+
+import com.zhgd.xmgl.modules.safety.entity.ProgressReportRecord;
+import com.zhgd.xmgl.modules.safety.mapper.ProgressReportRecordMapper;
+import com.zhgd.xmgl.modules.safety.service.IProgressReportRecordService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 工程进度上报记录
+ * @author： pengj
+ * @date：   2023-09-11
+ * @version： V1.0
+ */
+@Service
+public class ProgressReportRecordServiceImpl extends ServiceImpl<ProgressReportRecordMapper, ProgressReportRecord> implements IProgressReportRecordService {
+
+}

src/main/java/com/zhgd/xmgl/util/EmailsUtil.java

@@ -156,7 +156,7 @@ public class EmailsUtil {
     }
 
     public boolean send(String fromUser, String receiveUser, String title, String content) {
-        return send(fromUser, receiveUser, title, content, "");
+        return send(fromUser, receiveUser, title, content, null);
     }
 
     public boolean send(String fromUser, String receiveUser, String title, String content, String fileAttachments) {
@@ -178,8 +178,7 @@ public class EmailsUtil {
         return isSucc;
     }
 
-
     public static void main(String[] args) {
-//        EmailsUtil.send("1547224827@qq.com", "维基百科", "自由的百科全书：维基百科是一个内容自由、任何人都能参与、并有多种语言的百科全书协作计划...");
+//        EmailsUtil.send("1547224827@qq.com", "测试邮件", "自由的百科全书：维基百科是一个内容自由、任何人都能参与、并有多种语言的百科全书协作计划...");
     }
 }