diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java index e1dce9bdc..855265b0b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/MainProjectCompleteDetailController.java @@ -37,7 +37,7 @@ import java.util.Map; @Api(tags = "主要工程量完成情况详情表相关Api") public class MainProjectCompleteDetailController { @Autowired - private IMainProjectCompleteDetailService mainProjectCompleteDetail1Service; + private IMainProjectCompleteDetailService mainProjectCompleteDetailService; /** * 分页列表查询 @@ -52,7 +52,7 @@ public class MainProjectCompleteDetailController { }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(mainProjectCompleteDetail1Service.queryPageList(param)); + return Result.success(mainProjectCompleteDetailService.queryPageList(param)); } /** @@ -64,7 +64,7 @@ public class MainProjectCompleteDetailController { @ApiOperation(value = "列表查询主要工程量完成情况详情表信息", notes = "列表查询主要工程量完成情况详情表信息", httpMethod = "GET") @GetMapping(value = "/list") public Result> queryList(@ApiIgnore @RequestParam HashMap param) { - return Result.success(mainProjectCompleteDetail1Service.queryList(param)); + return Result.success(mainProjectCompleteDetailService.queryList(param)); } /** @@ -77,17 +77,16 @@ public class MainProjectCompleteDetailController { @ApiOperation(value = "添加主要工程量完成情况详情表信息", notes = "添加主要工程量完成情况详情表信息", httpMethod = "POST") @PostMapping(value = "/add") public Result add(@RequestBody @Validate MainProjectCompleteDetailVo mainProjectCompleteDetail) { - mainProjectCompleteDetail1Service.add(mainProjectCompleteDetail); + mainProjectCompleteDetailService.add(mainProjectCompleteDetail); return Result.ok(); } @OperLog(operModul = "主要工程量完成情况详情表管理", operType = "添加", operDesc = "工作流添加主要工程量完成情况详情表信息") @ApiOperation(value = "工作流添加主要工程量完成情况详情表信息", notes = "工作流添加主要工程量完成情况详情表信息", httpMethod = "POST") @PostMapping(value = "/flow/add") - public Result add(@RequestBody @Validate Map map) { + public Result addFromFlow(@RequestBody @Validate Map map) { log.info("工作流添加主要工程量完成情况详情表信息:{}", JSON.toJSONString(map)); - MainProjectCompleteDetailVo vo = new MainProjectCompleteDetailVo(); - mainProjectCompleteDetail1Service.edit(vo); + mainProjectCompleteDetailService.addFromFlow(map); return Result.ok(); } @@ -101,7 +100,7 @@ public class MainProjectCompleteDetailController { @ApiOperation(value = "编辑主要工程量完成情况详情表信息", notes = "编辑主要工程量完成情况详情表信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody MainProjectCompleteDetailVo mainProjectCompleteDetail) { - mainProjectCompleteDetail1Service.edit(mainProjectCompleteDetail); + mainProjectCompleteDetailService.edit(mainProjectCompleteDetail); return Result.ok(); } @@ -115,7 +114,7 @@ public class MainProjectCompleteDetailController { @ApiImplicitParam(name = "id", value = "主要工程量完成情况详情表ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") public Result delete(@ApiIgnore @RequestBody HashMap map) { - mainProjectCompleteDetail1Service.delete(MapUtils.getString(map, "id")); + mainProjectCompleteDetailService.delete(MapUtils.getString(map, "id")); return Result.ok(); } @@ -130,7 +129,7 @@ public class MainProjectCompleteDetailController { @ApiImplicitParam(name = "id", value = "主要工程量完成情况详情表ID", paramType = "query", required = true, dataType = "Integer") @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { - return Result.success(mainProjectCompleteDetail1Service.queryById(id)); + return Result.success(mainProjectCompleteDetailService.queryById(id)); } @OperLog(operModul = "主要工程量完成情况详情表管理", operType = "分页查询", operDesc = "树形分页列表查询主要工程量完成情况详情表信息") @@ -141,18 +140,19 @@ public class MainProjectCompleteDetailController { }) @GetMapping(value = "/tree/page") public Result> queryTreePage(@ApiIgnore @RequestParam HashMap param) { - return Result.success(mainProjectCompleteDetail1Service.queryTreePage(param)); + return Result.success(mainProjectCompleteDetailService.queryTreePage(param)); } @ApiOperation(value = "导出excel记录", notes = "导出excel记录", httpMethod = "POST") @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "deviceUnitIds", value = "装置ids（多个,分割）", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "mainProjectCompletePeriodId", value = "主要工程量完成情况时间段id", paramType = "body", required = true, dataType = "String"), @ApiImplicitParam(name = "levelType", value = "时间级别：1月2周", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/exportXls") public void exportXls(HttpServletRequest request, HttpServletResponse response, @RequestBody HashMap param) { - mainProjectCompleteDetail1Service.exportXls(request, response, param); + mainProjectCompleteDetailService.exportXls(request, response, param); } @OperLog(operModul = "主要工程量完成情况详情表管理", operType = "", operDesc = "计划总览") @@ -163,6 +163,20 @@ public class MainProjectCompleteDetailController { }) @GetMapping(value = "/projectOverview") public Result> projectOverview(@ApiIgnore @RequestParam HashMap param) { - return Result.success(mainProjectCompleteDetail1Service.projectOverview(param)); + return Result.success(mainProjectCompleteDetailService.projectOverview(param)); } + + @OperLog(operModul = "主要工程量完成情况详情表管理", operType = "", operDesc = "计划总览导出excel记录") + @ApiOperation(value = "计划总览导出excel记录", notes = "计划总览导出excel记录", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "deviceUnitIds", value = "装置ids（多个,分割）", paramType = "body", required = true, dataType = "String"), + }) + @GetMapping(value = "/projectOverviewExportXls") + public Result> projectOverviewExportXls(@ApiIgnore @RequestParam HashMap param) { + + return Result.ok(); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ProjectSupervisionMonthlyReportController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ProjectSupervisionMonthlyReportController.java new file mode 100644 index 000000000..88ea865ef --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ProjectSupervisionMonthlyReportController.java @@ -0,0 +1,144 @@ +package com.zhgd.xmgl.modules.baotou.controller; + +import com.alibaba.fastjson.JSON; +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.baotou.entity.ProjectSupervisionMonthlyReport; +import com.zhgd.xmgl.modules.baotou.service.IProjectSupervisionMonthlyReportService; +import com.zhgd.xmgl.util.FlowUtil; +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.apache.commons.collections.MapUtils; +import org.simpleframework.xml.core.Validate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +/** + * @Title: Controller + * @Description: 工程质量监督月报 + * @author： pds + * @date： 2024-09-29 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/projectSupervisionMonthlyReport") +@Slf4j +@Api(tags = "工程质量监督月报相关Api") +public class ProjectSupervisionMonthlyReportController { + @Autowired + private IProjectSupervisionMonthlyReportService projectSupervisionMonthlyReportService; + + /** + * 分页列表查询 + * + * @return + */ + @OperLog(operModul = "工程质量监督月报管理", operType = "分页查询", operDesc = "分页列表查询工程质量监督月报信息") + @ApiOperation(value = "分页列表查询工程质量监督月报信息", notes = "分页列表查询工程质量监督月报信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(projectSupervisionMonthlyReportService.queryPageList(param)); + } + + /** + * 列表查询 + * + * @return + */ + @OperLog(operModul = "工程质量监督月报管理", operType = "列表查询", operDesc = "列表查询工程质量监督月报信息") + @ApiOperation(value = "列表查询工程质量监督月报信息", notes = "列表查询工程质量监督月报信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap param) { + return Result.success(projectSupervisionMonthlyReportService.queryList(param)); + } + + /** + * 添加 + * + * @param projectSupervisionMonthlyReport + * @return + */ + @OperLog(operModul = "工程质量监督月报管理", operType = "添加", operDesc = "添加工程质量监督月报信息") + @ApiOperation(value = "添加工程质量监督月报信息", notes = "添加工程质量监督月报信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport) { + projectSupervisionMonthlyReportService.add(projectSupervisionMonthlyReport); + return Result.ok(); + } + + @OperLog(operModul = "工程质量监督月报管理", operType = "添加", operDesc = "工作流添加工程质量监督月报信息") + @ApiOperation(value = "工作流添加工程质量监督月报信息", notes = "工作流添加工程质量监督月报信息", httpMethod = "POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody @Validate Map map) { + log.info("工作流添加工程质量监督月报信息:{}", JSON.toJSONString(map)); + String number = FlowUtil.getString(map, "number"); + String attachment = FlowUtil.getJSONString(map, "attachment"); + String projectSn = FlowUtil.getString(map, "projectSn"); + Date time = FlowUtil.getDate(map, "time"); + ProjectSupervisionMonthlyReport report = new ProjectSupervisionMonthlyReport(); + report.setNumber(number); + report.setAttachment(attachment); + report.setTime(time); + report.setProjectSn(projectSn); + projectSupervisionMonthlyReportService.add(report); + return Result.ok(); + } + + /** + * 编辑 + * + * @param projectSupervisionMonthlyReport + * @return + */ + @OperLog(operModul = "工程质量监督月报管理", operType = "编辑", operDesc = "编辑工程质量监督月报信息") + @ApiOperation(value = "编辑工程质量监督月报信息", notes = "编辑工程质量监督月报信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport) { + projectSupervisionMonthlyReportService.edit(projectSupervisionMonthlyReport); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @OperLog(operModul = "工程质量监督月报管理", operType = "删除", operDesc = "删除工程质量监督月报信息") + @ApiOperation(value = "删除工程质量监督月报信息", notes = "删除工程质量监督月报信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "工程质量监督月报ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + projectSupervisionMonthlyReportService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @OperLog(operModul = "工程质量监督月报管理", operType = "通过id查询", operDesc = "通过id查询工程质量监督月报信息") + @ApiOperation(value = "通过id查询工程质量监督月报信息", notes = "通过id查询工程质量监督月报信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "工程质量监督月报ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + return Result.success(projectSupervisionMonthlyReportService.queryById(id)); + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectScheduleDeviceUnit.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectScheduleDeviceUnit.java index 632cab051..5639b6943 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectScheduleDeviceUnit.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectScheduleDeviceUnit.java @@ -77,9 +77,16 @@ public class ProjectScheduleDeviceUnit implements Serializable { @Excel(name = "祖级列表", width = 15) @ApiModelProperty(value = "祖级列表") private String ancestors; - + /** + * 项目组绑定的装置单位ids + */ + @ApiModelProperty(value = "项目组绑定的装置单位ids") + private java.lang.String bindDeviceUnitIds; @TableField(exist = false) private List children; @TableField(exist = false) private List schedules; + @TableField(exist = false) + @ApiModelProperty(value="项目组绑定的装置单位名称s") + private java.lang.String bindDeviceUnitNames ; } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectSupervisionMonthlyReport.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectSupervisionMonthlyReport.java new file mode 100644 index 000000000..6e9ba7736 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/ProjectSupervisionMonthlyReport.java @@ -0,0 +1,54 @@ +package com.zhgd.xmgl.modules.baotou.entity; + +import java.io.Serializable; +import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +/** + * @Description: 工程质量监督月报 + * @author： pds + * @date： 2024-09-29 + * @version： V1.0 + */ +@Data +@TableName("project_supervision_monthly_report") +@ApiModel(value="ProjectSupervisionMonthlyReport实体类",description="ProjectSupervisionMonthlyReport") +public class ProjectSupervisionMonthlyReport implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private java.lang.Long id ; + /**期数*/ + @ApiModelProperty(value="期数") + private java.lang.String number ; + /**附件*/ + @ApiModelProperty(value="附件") + private java.lang.String attachment ; + /**时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="时间") + private java.util.Date time ; + /**项目sn*/ + @ApiModelProperty(value="项目sn") + private java.lang.String projectSn ; + /**创建时间 yyyy-MM-dd HH:mm:ss*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date createDate ; + /**更新时间 yyyy-MM-dd HH:mm:ss*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateDate ; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/ProjectSupervisionMonthlyReportMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/ProjectSupervisionMonthlyReportMapper.java new file mode 100644 index 000000000..a6bd3a119 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/ProjectSupervisionMonthlyReportMapper.java @@ -0,0 +1,50 @@ +package com.zhgd.xmgl.modules.baotou.mapper; + +import java.util.List; +import java.util.HashMap; +import com.zhgd.xmgl.modules.baotou.entity.ProjectSupervisionMonthlyReport; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 工程质量监督月报 + * @author： pds + * @date： 2024-09-29 + * @version： V1.0 + */ +@Mapper +public interface ProjectSupervisionMonthlyReportMapper extends BaseMapper { + + /** + * 分页列表查询工程质量监督月报信息 + * + * @param page + * @param queryWrapper + * @param param + * @return + */ + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + /** + * 列表查询工程质量监督月报信息 + * + * @param queryWrapper + * @param param + * @return + */ + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, @Param("param") HashMap param); + + + /** + * 通过id查询工程质量监督月报信息 + * + * @param id + * @return + */ + ProjectSupervisionMonthlyReport queryById(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml index 7cd4468ad..4a4151a43 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DeviceUnitMapper.xml @@ -7,13 +7,15 @@ group_concat(distinct pg.project_group_name) as project_group_name, group_concat(distinct ei.enterprise_name) as epc_contractor_name, group_concat(distinct ei3.enterprise_name) as construction_unit_name, - group_concat(distinct pgu.supervising_unit_id) as supervising_unit_ids + group_concat(distinct pgu.supervising_unit_id) as supervising_unit_ids, + group_concat(distinct ei4.enterprise_name) as supervising_unit_name from device_unit t join project_group pg on find_in_set(pg.id,t.project_group_ids) left join project_group_unit pgu on pg.id = pgu.project_group_id left join enterprise_info ei on find_in_set(ei.id,t.epc_contractor_ids) left join enterprise_info ei3 on find_in_set(ei3.id,t.construction_unit_ids) + left join enterprise_info ei4 on find_in_set(ei4.id,pgu.supervising_unit_id) ${ew.customSqlSegment} group by t.id order by t.create_date desc diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml index 0eb427b30..ac05877b2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectScheduleDeviceUnitMapper.xml @@ -4,19 +4,24 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectSupervisionMonthlyReportMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectSupervisionMonthlyReportMapper.xml new file mode 100644 index 000000000..7b87bd5ae --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/ProjectSupervisionMonthlyReportMapper.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/WorkerAccessRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/WorkerAccessRecordController.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/WorkerAccessRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/WorkerAccessRecordController.java index 8675915f9..fe0b47012 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/WorkerAccessRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/WorkerAccessRecordController.java @@ -1,13 +1,12 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; -import com.zhgd.xmgl.modules.xz.security.entity.WorkerAccessRecord; -import com.zhgd.xmgl.modules.xz.security.entity.WorkerAccessRecord; -import com.zhgd.xmgl.modules.xz.security.service.IWorkerAccessRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.WorkerAccessRecord; +import com.zhgd.xmgl.modules.baotou.security.service.IWorkerAccessRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzMilestoneController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzMilestoneController.java similarity index 100% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzMilestoneController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzMilestoneController.java diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerItemRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityDangerItemRecordController.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerItemRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityDangerItemRecordController.java index 891afd021..9939101d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerItemRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityDangerItemRecordController.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerItemRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerItemRecord; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityDangerItemRecordService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityDangerTypeRecordController.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityDangerTypeRecordController.java index d84631d39..edf3f56ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityDangerTypeRecordController.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerTypeRecord; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerItemRecordService; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerTypeRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerTypeRecord; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityDangerItemRecordService; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityDangerTypeRecordService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityInspectTaskItemRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityInspectTaskItemRecordController.java similarity index 92% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityInspectTaskItemRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityInspectTaskItemRecordController.java index a24a49d3a..1d2c7679d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityInspectTaskItemRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityInspectTaskItemRecordController.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskItemRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskItemRecord; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityInspectTaskItemRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityInspectTaskRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityInspectTaskRecordController.java similarity index 92% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityInspectTaskRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityInspectTaskRecordController.java index 4aca2b22a..ddd1adfee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityInspectTaskRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityInspectTaskRecordController.java @@ -1,12 +1,12 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityInspectTaskRecordVo; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityInspectTaskRecordVo; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityInspectTaskRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java index de380c702..f3bcd1312 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityInspectionRecordController.java @@ -1,20 +1,22 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gexin.fastjson.JSON; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.constant.Cts; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.*; import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService; +import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise; import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.*; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -518,4 +520,13 @@ public class XzSecurityQualityInspectionRecordController { return Result.success(qualityInspectionRecordService.querySpecialPage(map)); } + @OperLog(operModul = "安全检查记录", operType = "", operDesc = "工作流添加安全检查记录") + @ApiOperation(value = "工作流添加安全检查记录", notes = "工作流添加安全检查记录", httpMethod = "POST") + @PostMapping(value = "/flow/add") + public Result addFromFlow(@RequestBody Map map) { + log.info("工作流添加安全检查记录:{}", JSON.toJSONString(map)); + qualityInspectionRecordService.addFromFlow(map); + return Result.ok(); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityRectifyRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityRectifyRecordController.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityRectifyRecordController.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityRectifyRecordController.java index ec02e260e..6f2223d4b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityRectifyRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/controller/XzSecurityQualityRectifyRecordController.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.xz.security.controller; +package com.zhgd.xmgl.modules.baotou.security.controller; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityRectifyRecord; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityRectifyRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityRectifyRecord; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityRectifyRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/WorkerAccessRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/WorkerAccessRecord.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/WorkerAccessRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/WorkerAccessRecord.java index 8424db9d7..60f50b620 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/WorkerAccessRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/WorkerAccessRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzMilestone.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzMilestone.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzMilestone.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzMilestone.java index b816f0938..81a678f5e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzMilestone.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzMilestone.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerItemRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityDangerItemRecord.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerItemRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityDangerItemRecord.java index 7fb3baa71..b2d966235 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerItemRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityDangerItemRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import java.io.Serializable; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerTypeRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityDangerTypeRecord.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerTypeRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityDangerTypeRecord.java index 3b206275d..4fbe53023 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityDangerTypeRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityDangerTypeRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import java.io.Serializable; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityInspectTaskItemRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityInspectTaskItemRecord.java similarity index 97% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityInspectTaskItemRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityInspectTaskItemRecord.java index 49bc74f3c..c09ca7219 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityInspectTaskItemRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityInspectTaskItemRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import java.io.Serializable; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityInspectTaskRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityInspectTaskRecord.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityInspectTaskRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityInspectTaskRecord.java index d2bc8dab3..5475c216d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityInspectTaskRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityInspectTaskRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import java.io.Serializable; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityProjectDangerTypeDisable.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityProjectDangerTypeDisable.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityProjectDangerTypeDisable.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityProjectDangerTypeDisable.java index 8db7b15d0..33174b993 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityProjectDangerTypeDisable.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityProjectDangerTypeDisable.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import java.io.Serializable; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityQualityInspectionRecord.java similarity index 83% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityQualityInspectionRecord.java index 2be566093..75b4384cc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityInspectionRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityQualityInspectionRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -55,10 +55,10 @@ public class XzSecurityQualityInspectionRecord implements Serializable { @ApiModelProperty(value = "补充说明") private String dangerDesc; /** - * 问题描述 + * 问题分类描述 */ - @Excel(name = "问题描述", width = 15) - @ApiModelProperty(value = "问题描述") + @Excel(name = "问题分类描述", width = 15) + @ApiModelProperty(value = "问题分类描述") private String dangerItemContent; /** * 问题子项ID @@ -93,10 +93,10 @@ public class XzSecurityQualityInspectionRecord implements Serializable { @ApiModelProperty(value = "紧急程度，1一般，2严重，3紧要") private String urgentLevel; /** - * 状态，2待整改，3待复查，4待核验，5合格，6已撤回 + * 状态，2待整改，3整改中，5合格 */ - @Excel(name = "状态，2待整改，3待复查，4待核验，5合格，6已撤回", width = 15) - @ApiModelProperty(value = "状态，2待整改，3待复查，4待核验，5合格，6已撤回") + @Excel(name = "状态，2待整改，3整改中，5合格", width = 15) + @ApiModelProperty(value = "状态，2待整改，3整改中，5合格") private java.lang.Integer status; /** * 通知人 @@ -246,6 +246,46 @@ public class XzSecurityQualityInspectionRecord implements Serializable { */ @ApiModelProperty(value = "1危大2动火3受限空间4盲板抽堵5高出6吊装7临时用电8动土9断路") private Integer type; + /** + * 合同模式：1EPC;2E+P+C + */ + @ApiModelProperty("合同模式：1EPC;2E+P+C") + private Integer contractModel; + /** + * 装置id + */ + @ApiModelProperty("装置id") + private Long deviceUnitId; + /** + * 项目组管理id + */ + @ApiModelProperty("项目组管理id") + private Long projectGroupId; + /** + * 监理单位id + */ + @ApiModelProperty("监理单位id") + private Long supervisingUnitId; + /** + * EPC承包商id + */ + @ApiModelProperty("EPC承包商id") + private Long epcContractorId; + /** + * 施工承包商id + */ + @ApiModelProperty("施工承包商id") + private Long constructionContractorId; + /** + * 安全类型：1检查问题;2隐患问题 + */ + @ApiModelProperty("安全类型：1检查问题;2隐患问题") + private Integer securityType; + /** + * 安全隐患情况表述 + */ + @ApiModelProperty("安全隐患情况表述") + private String securityRiskStatement; /** * 分部工程名称 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityRectifyRecord.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityQualityRectifyRecord.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityRectifyRecord.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityQualityRectifyRecord.java index 0b499988b..e8371cfba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/XzSecurityQualityRectifyRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/XzSecurityQualityRectifyRecord.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity; +package com.zhgd.xmgl.modules.baotou.security.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/dto/XzSecurityDepartmentRectifiedRankDto.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/dto/XzSecurityDepartmentRectifiedRankDto.java similarity index 86% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/dto/XzSecurityDepartmentRectifiedRankDto.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/dto/XzSecurityDepartmentRectifiedRankDto.java index 93081f410..f149c0b08 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/dto/XzSecurityDepartmentRectifiedRankDto.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/dto/XzSecurityDepartmentRectifiedRankDto.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.dto; +package com.zhgd.xmgl.modules.baotou.security.entity.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/FiveScoresVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/FiveScoresVo.java similarity index 80% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/FiveScoresVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/FiveScoresVo.java index 69e4ce6db..b48825fe5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/FiveScoresVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/FiveScoresVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/GetStatScoreVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/GetStatScoreVo.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/GetStatScoreVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/GetStatScoreVo.java index 4778533a9..7155c5247 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/GetStatScoreVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/GetStatScoreVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByChangeIdVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByChangeIdVo.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByChangeIdVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByChangeIdVo.java index 8068e76c1..1f0e44f5c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByChangeIdVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByChangeIdVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByEnterpriseVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByEnterpriseVo.java similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByEnterpriseVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByEnterpriseVo.java index 61e1ce6eb..8ff4a188d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByEnterpriseVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByEnterpriseVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByInspectManVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByInspectManVo.java similarity index 88% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByInspectManVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByInspectManVo.java index bb9e54219..2f3445444 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsByInspectManVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsByInspectManVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsDirectorateBigscreenVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsDirectorateBigscreenVo.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsDirectorateBigscreenVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsDirectorateBigscreenVo.java index 55647e9be..cac73a035 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/StatsDirectorateBigscreenVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/StatsDirectorateBigscreenVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/TenScore.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/TenScore.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/TenScore.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/TenScore.java index b5713bd78..85ca6f94a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/TenScore.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/TenScore.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityAllAndWeekDataVO.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityAllAndWeekDataVO.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityAllAndWeekDataVO.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityAllAndWeekDataVO.java index 1a9cd9a95..08ce542bb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityAllAndWeekDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityAllAndWeekDataVO.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityAllDataVO.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityAllDataVO.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityAllDataVO.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityAllDataVO.java index df1188e8a..6ab13e335 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityAllDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityAllDataVO.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityDepartmentRectifiedRankVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityDepartmentRectifiedRankVo.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityDepartmentRectifiedRankVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityDepartmentRectifiedRankVo.java index 327a5e18a..4adbafd36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityDepartmentRectifiedRankVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityDepartmentRectifiedRankVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityInspectTaskRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityInspectTaskRecordVo.java similarity index 77% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityInspectTaskRecordVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityInspectTaskRecordVo.java index abff98a94..5907471e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityInspectTaskRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityInspectTaskRecordVo.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java similarity index 99% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java index 21ecf2de5..7a1f6d131 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityQualityInspectionRecordTotalVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityQualityInspectionRecordVo.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityQualityInspectionRecordVo.java index 7e638fb97..b294476c8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityQualityInspectionRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityQualityInspectionRecordVo.java @@ -1,7 +1,6 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityRecordVo.java similarity index 81% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityRecordVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityRecordVo.java index 43ae442e1..f14c482d4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityRecordVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecuritySelectQualityStatisticsVo.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecuritySelectQualityStatisticsVo.java similarity index 84% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecuritySelectQualityStatisticsVo.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecuritySelectQualityStatisticsVo.java index 05c597ee7..3a657cb69 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecuritySelectQualityStatisticsVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecuritySelectQualityStatisticsVo.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java index 3d316cb4f..d502fce3e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityXzSecurityAllAndThisWeekDataVO.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java index fdee1f160..0e0a924d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/entity/vo/XzSecurityXzSecurityAllAndTodayDataVO.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.entity.vo; +package com.zhgd.xmgl.modules.baotou.security.entity.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/FiveSafetyTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/FiveSafetyTypeEnum.java similarity index 92% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/FiveSafetyTypeEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/FiveSafetyTypeEnum.java index 91738794a..de7c27f9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/FiveSafetyTypeEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/FiveSafetyTypeEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import lombok.Getter; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/TenSafetyTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/TenSafetyTypeEnum.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/TenSafetyTypeEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/TenSafetyTypeEnum.java index e05dae3e7..391d4351d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/TenSafetyTypeEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/TenSafetyTypeEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import lombok.Getter; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityDangerTypeRecordLevelEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityDangerTypeRecordLevelEnum.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityDangerTypeRecordLevelEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityDangerTypeRecordLevelEnum.java index 8cf596d49..09536cc3b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityDangerTypeRecordLevelEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityDangerTypeRecordLevelEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.xmgl.enums.BaseEnum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityInspectTaskRecordFrequencyTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityInspectTaskRecordFrequencyTypeEnum.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityInspectTaskRecordFrequencyTypeEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityInspectTaskRecordFrequencyTypeEnum.java index cc210b320..657ae00fb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityInspectTaskRecordFrequencyTypeEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityInspectTaskRecordFrequencyTypeEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.xmgl.enums.BaseEnum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityInspectionRecordRecordTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityInspectionRecordRecordTypeEnum.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityInspectionRecordRecordTypeEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityInspectionRecordRecordTypeEnum.java index b1d0aab4a..ecd8b9d25 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityInspectionRecordRecordTypeEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityInspectionRecordRecordTypeEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.xmgl.enums.BaseEnum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityInspectionRecordStatusEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityInspectionRecordStatusEnum.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityInspectionRecordStatusEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityInspectionRecordStatusEnum.java index 41ec90607..66160a04f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityInspectionRecordStatusEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityInspectionRecordStatusEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.xmgl.enums.BaseEnum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityRectifyRecordStatusEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityRectifyRecordStatusEnum.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityRectifyRecordStatusEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityRectifyRecordStatusEnum.java index 4b258b343..187608a60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityRectifyRecordStatusEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityRectifyRecordStatusEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.xmgl.enums.BaseEnum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityRectifyRecordTypeEnum.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityRectifyRecordTypeEnum.java similarity index 94% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityRectifyRecordTypeEnum.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityRectifyRecordTypeEnum.java index cc1ba4464..378626881 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/enums/XzSecurityQualityRectifyRecordTypeEnum.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/enums/XzSecurityQualityRectifyRecordTypeEnum.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.enums; +package com.zhgd.xmgl.modules.baotou.security.enums; import com.fasterxml.jackson.annotation.JsonFormat; import com.zhgd.xmgl.enums.BaseEnum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/WorkerAccessRecordMapper.java similarity index 71% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/WorkerAccessRecordMapper.java index 6ce6d7915..9f78be8c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/WorkerAccessRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/WorkerAccessRecordMapper.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; -import com.zhgd.xmgl.modules.xz.security.entity.WorkerAccessRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.WorkerAccessRecord; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzMilestoneMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzMilestoneMapper.java similarity index 70% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzMilestoneMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzMilestoneMapper.java index 405c3f1f6..774f54fff 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzMilestoneMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzMilestoneMapper.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import org.apache.ibatis.annotations.Mapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzMilestone; +import com.zhgd.xmgl.modules.baotou.security.entity.XzMilestone; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerItemRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityDangerItemRecordMapper.java similarity index 88% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerItemRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityDangerItemRecordMapper.java index 8d91c7969..4d072bbf6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerItemRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityDangerItemRecordMapper.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerItemRecord; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerTypeRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityDangerTypeRecordMapper.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerTypeRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityDangerTypeRecordMapper.java index 66f07deb1..0398735e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityDangerTypeRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityDangerTypeRecordMapper.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerTypeRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerTypeRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityInspectTaskItemRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityInspectTaskItemRecordMapper.java similarity index 84% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityInspectTaskItemRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityInspectTaskItemRecordMapper.java index ee7bc14e0..edc80a174 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityInspectTaskItemRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityInspectTaskItemRecordMapper.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskItemRecord; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityInspectTaskRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityInspectTaskRecordMapper.java similarity index 81% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityInspectTaskRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityInspectTaskRecordMapper.java index 5c4780a9c..84c54a3e2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityInspectTaskRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityInspectTaskRecordMapper.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityInspectTaskRecordVo; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityInspectTaskRecordVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityProjectDangerTypeDisableMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityProjectDangerTypeDisableMapper.java similarity index 71% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityProjectDangerTypeDisableMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityProjectDangerTypeDisableMapper.java index f85ce16a4..bb226d0ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityProjectDangerTypeDisableMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityProjectDangerTypeDisableMapper.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityProjectDangerTypeDisable; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityProjectDangerTypeDisable; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityQualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityQualityInspectionRecordMapper.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityQualityInspectionRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityQualityInspectionRecordMapper.java index 694382d56..8afeb7855 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityQualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityQualityInspectionRecordMapper.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -6,9 +6,9 @@ import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.*; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityQualityRectifyRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityQualityRectifyRecordMapper.java similarity index 80% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityQualityRectifyRecordMapper.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityQualityRectifyRecordMapper.java index 9ff06ef81..b26ea13ee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/XzSecurityQualityRectifyRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/XzSecurityQualityRectifyRecordMapper.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.xz.security.mapper; +package com.zhgd.xmgl.modules.baotou.security.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityRectifyRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityRectifyRecord; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/WorkerAccessRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/WorkerAccessRecordMapper.xml similarity index 63% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/WorkerAccessRecordMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/WorkerAccessRecordMapper.xml index 3932f8890..d5524acf7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/WorkerAccessRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/WorkerAccessRecordMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzMilestoneMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzMilestoneMapper.xml similarity index 65% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzMilestoneMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzMilestoneMapper.xml index 47ef00278..bef6b2f6e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzMilestoneMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzMilestoneMapper.xml @@ -1,4 +1,4 @@ - + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityDangerItemRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityDangerItemRecordMapper.xml similarity index 80% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityDangerItemRecordMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityDangerItemRecordMapper.xml index 4c99d30c8..5e1307fd1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityDangerItemRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityDangerItemRecordMapper.xml @@ -1,8 +1,8 @@ - + + - select * from xz_security_danger_type_record where code in diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityInspectTaskItemRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityInspectTaskItemRecordMapper.xml similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityInspectTaskItemRecordMapper.xml rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityInspectTaskItemRecordMapper.xml index fc2f4b325..5fb356a38 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/mapper/xml/XzSecurityInspectTaskItemRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/mapper/xml/XzSecurityInspectTaskItemRecordMapper.xml @@ -1,6 +1,6 @@ - + + + + resultType="com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityQualityInspectionRecordVo"> SELECT a.*, b.enterprise_name, c.full_name, @@ -248,7 +248,7 @@ WHERE a.id = #{id} @@ -535,7 +535,7 @@ - select COUNT(1) allTotal, @@ -585,8 +585,8 @@ WHERE a.project_sn = #{projectSn} - select t.*, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) rectifiedNumRatio, @@ -675,7 +675,7 @@ group by enumType - select t.*, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100,2) as rectifiedNumRatio, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNumTimely, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) as @@ -696,7 +696,7 @@ order by rectifiedNum desc) t - select t.*, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) rectifiedNumRatio, @@ -729,7 +729,7 @@ + resultType="com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityRectifyRecord"> select a.*,b.real_name create_user_name from xz_security_quality_rectify_record a LEFT JOIN system_user b ON a.create_user=b.user_id diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IWorkerAccessRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IWorkerAccessRecordService.java similarity index 90% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IWorkerAccessRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IWorkerAccessRecordService.java index 822b7e114..c2097698b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IWorkerAccessRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IWorkerAccessRecordService.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.xz.security.entity.WorkerAccessRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.WorkerAccessRecord; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzMilestoneService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzMilestoneService.java similarity index 89% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzMilestoneService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzMilestoneService.java index 499b8d844..50f38184a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzMilestoneService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzMilestoneService.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.xz.security.entity.XzMilestone; +import com.zhgd.xmgl.modules.baotou.security.entity.XzMilestone; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerItemRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityDangerItemRecordService.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerItemRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityDangerItemRecordService.java index 8ddb2504d..fbb8d669e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerItemRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityDangerItemRecordService.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerItemRecord; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerTypeRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityDangerTypeRecordService.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerTypeRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityDangerTypeRecordService.java index 47dcecbda..afccd02c7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityDangerTypeRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityDangerTypeRecordService.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerTypeRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerTypeRecord; import org.springframework.web.multipart.MultipartFile; import java.util.List; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityInspectTaskItemRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityInspectTaskItemRecordService.java similarity index 83% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityInspectTaskItemRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityInspectTaskItemRecordService.java index 6d62cff28..98732635a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityInspectTaskItemRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityInspectTaskItemRecordService.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskItemRecord; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityInspectTaskRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityInspectTaskRecordService.java similarity index 82% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityInspectTaskRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityInspectTaskRecordService.java index 3d94f7e3b..f024eac3c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityInspectTaskRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityInspectTaskRecordService.java @@ -1,10 +1,10 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityInspectTaskRecordVo; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityInspectTaskRecordVo; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityProjectDangerTypeDisableService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityProjectDangerTypeDisableService.java similarity index 68% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityProjectDangerTypeDisableService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityProjectDangerTypeDisableService.java index 627bbf8db..f876e172f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityProjectDangerTypeDisableService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityProjectDangerTypeDisableService.java @@ -1,6 +1,6 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityProjectDangerTypeDisable; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityProjectDangerTypeDisable; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityQualityInspectionRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityQualityInspectionRecordService.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityQualityInspectionRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityQualityInspectionRecordService.java index f92f66f0e..acc3b12e8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityQualityInspectionRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityQualityInspectionRecordService.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -6,9 +6,9 @@ import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.*; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.*; import javax.servlet.http.HttpServletResponse; import java.util.Date; @@ -312,4 +312,6 @@ public interface IXzSecurityQualityInspectionRecordService extends IService querySpecialPage(Map map); + + void addFromFlow(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityQualityRectifyRecordService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityQualityRectifyRecordService.java similarity index 88% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityQualityRectifyRecordService.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityQualityRectifyRecordService.java index 7c03d8aab..65c25dad1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/IXzSecurityQualityRectifyRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/IXzSecurityQualityRectifyRecordService.java @@ -1,7 +1,7 @@ -package com.zhgd.xmgl.modules.xz.security.service; +package com.zhgd.xmgl.modules.baotou.security.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityRectifyRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityRectifyRecord; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/WorkerAccessRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/WorkerAccessRecordServiceImpl.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/WorkerAccessRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/WorkerAccessRecordServiceImpl.java index 979eaaa5e..de593efbc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/WorkerAccessRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/WorkerAccessRecordServiceImpl.java @@ -1,9 +1,9 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.xz.security.entity.WorkerAccessRecord; -import com.zhgd.xmgl.modules.xz.security.mapper.WorkerAccessRecordMapper; -import com.zhgd.xmgl.modules.xz.security.service.IWorkerAccessRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.WorkerAccessRecord; +import com.zhgd.xmgl.modules.baotou.security.mapper.WorkerAccessRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IWorkerAccessRecordService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzMilestoneServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzMilestoneServiceImpl.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzMilestoneServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzMilestoneServiceImpl.java index 484109fcb..74c76fcd4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzMilestoneServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzMilestoneServiceImpl.java @@ -1,11 +1,11 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.xz.security.entity.XzMilestone; -import com.zhgd.xmgl.modules.xz.security.mapper.XzMilestoneMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzMilestoneService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzMilestone; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzMilestoneMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzMilestoneService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerItemRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityDangerItemRecordServiceImpl.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerItemRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityDangerItemRecordServiceImpl.java index c6249f137..80b91b95a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerItemRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityDangerItemRecordServiceImpl.java @@ -1,16 +1,16 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.constant.Cts; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityProjectDangerTypeDisable; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityProjectDangerTypeDisableMapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerTypeRecord; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerItemRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerTypeRecordMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerItemRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityProjectDangerTypeDisable; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityProjectDangerTypeDisableMapper; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerTypeRecord; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityDangerItemRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityDangerTypeRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityDangerItemRecordService; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerTypeRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityDangerTypeRecordServiceImpl.java similarity index 96% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerTypeRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityDangerTypeRecordServiceImpl.java index 61eb29cbb..cb7f802e5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityDangerTypeRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityDangerTypeRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerTypeRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityProjectDangerTypeDisable; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityDangerTypeRecordLevelEnum; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerItemRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerTypeRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityProjectDangerTypeDisableMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityDangerTypeRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerTypeRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityProjectDangerTypeDisable; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityDangerTypeRecordLevelEnum; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityDangerItemRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityDangerTypeRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityProjectDangerTypeDisableMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityDangerTypeRecordService; import com.zhgd.xmgl.util.CodeUtils; import com.zhgd.xmgl.util.ExcelUtils; import com.zhgd.xmgl.util.MessageUtil; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskItemRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityInspectTaskItemRecordServiceImpl.java similarity index 87% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskItemRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityInspectTaskItemRecordServiceImpl.java index ac5726bc2..14b955bbf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskItemRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityInspectTaskItemRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -8,13 +8,13 @@ import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskItemRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskRecordMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskItemRecordService; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityInspectTaskItemRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityInspectTaskRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityInspectTaskItemRecordService; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java similarity index 93% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java index d75f282d6..451760b79 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityInspectTaskRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; @@ -11,15 +11,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.HiddenDangerInspectRecord; import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityInspectTaskRecordVo; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityInspectTaskRecordFrequencyTypeEnum; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskItemRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityInspectTaskRecordMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityInspectTaskRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityInspectTaskRecordVo; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityInspectTaskRecordFrequencyTypeEnum; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityInspectTaskItemRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityInspectTaskRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityInspectTaskRecordService; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityProjectDangerTypeDisableServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityProjectDangerTypeDisableServiceImpl.java similarity index 58% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityProjectDangerTypeDisableServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityProjectDangerTypeDisableServiceImpl.java index 8ac6e78f9..7747a2e57 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityProjectDangerTypeDisableServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityProjectDangerTypeDisableServiceImpl.java @@ -1,8 +1,8 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityProjectDangerTypeDisable; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityProjectDangerTypeDisableMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityProjectDangerTypeDisableService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityProjectDangerTypeDisable; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityProjectDangerTypeDisableMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityProjectDangerTypeDisableService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java similarity index 91% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java index b4c303905..b731544ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityInspectionRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; @@ -21,6 +21,8 @@ import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.call.SanjiangDataCall; import com.zhgd.xmgl.constant.Cts; import com.zhgd.xmgl.enums.ParamEnum; +import com.zhgd.xmgl.modules.baotou.security.entity.*; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.*; import com.zhgd.xmgl.modules.basicdata.entity.Notice; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; @@ -50,17 +52,15 @@ import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import com.zhgd.xmgl.modules.xz.enums.XzDangerousEngineeringAcceptanceTypeEnum; import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper; import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressContentMapper; -import com.zhgd.xmgl.modules.xz.security.entity.*; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.*; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityQualityInspectionRecordRecordTypeEnum; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityQualityInspectionRecordStatusEnum; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerItemRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityQualityInspectionRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityQualityRectifyRecordMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskItemRecordService; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityInspectTaskRecordService; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityQualityInspectionRecordRecordTypeEnum; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityQualityInspectionRecordStatusEnum; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityDangerItemRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityQualityInspectionRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityQualityRectifyRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityInspectTaskItemRecordService; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityInspectTaskRecordService; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.service.IXzWorkerSafeWatchConfigService; import com.zhgd.xmgl.modules.xz.special.service.CountApiService; import com.zhgd.xmgl.push.config.PushPayloads; @@ -950,6 +950,85 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl map) { + Long dangerItemId = FlowUtil.getPullDownLong(map, "dangerItemId"); + Long dangerTypeId = FlowUtil.getPullDownLong(map, "dangerTypeId"); + Long creatorId = FlowUtil.getPullDownLong(map, "creatorId"); + Long changeId = FlowUtil.getPullDownLong(map, "changeId"); + Long reviewId = FlowUtil.getPullDownLong(map, "reviewId"); + Long verifyManId = FlowUtil.getPullDownLong(map, "verifyManId"); + Long inspectManId = FlowUtil.getPullDownLong(map, "inspectManId"); + Long taskId = FlowUtil.getPullDownLong(map, "taskId"); + Long itemId = FlowUtil.getPullDownLong(map, "itemId"); + Long subsectionId = FlowUtil.getPullDownLong(map, "subsectionId"); + Long subentryId = FlowUtil.getPullDownLong(map, "subentryId"); + Long deviceUnitId = FlowUtil.getPullDownLong(map, "deviceUnitId"); + Long projectGroupId = FlowUtil.getPullDownLong(map, "projectGroupId"); + Long supervisingUnitId = FlowUtil.getPullDownLong(map, "supervisingUnitId"); + Long epcContractorId = FlowUtil.getPullDownLong(map, "epcContractorId"); + Long constructionContractorId = FlowUtil.getPullDownLong(map, "constructionContractorId"); + String regionName = FlowUtil.getString(map, "regionName"); + String remark = FlowUtil.getString(map, "remark"); + String dangerDesc = FlowUtil.getString(map, "dangerDesc"); + String dangerItemContent = FlowUtil.getString(map, "dangerItemContent"); + String urgentLevel = FlowUtil.getString(map, "urgentLevel"); + String notifyPerson = FlowUtil.getString(map, "notifyPerson"); + String createTime = FlowUtil.getString(map, "createTime"); + String changeLimitTime = FlowUtil.getString(map, "changeLimitTime"); + String inspectTime = FlowUtil.getString(map, "inspectTime"); + String enterpriseSn = FlowUtil.getString(map, "enterpriseSn"); + String imageUrl = FlowUtil.getString(map, "imageUrl"); + String fileUrl = FlowUtil.getString(map, "fileUrl"); + String completeTime = FlowUtil.getString(map, "completeTime"); + String projectSn = FlowUtil.getString(map, "projectSn"); + String floor = FlowUtil.getString(map, "floor"); + String addedDescription = FlowUtil.getString(map, "addedDescription"); + String securityRiskStatement = FlowUtil.getString(map, "securityRiskStatement"); + Integer level = FlowUtil.getPullDownInteger(map, "level"); + Integer recordType = FlowUtil.getPullDownInteger(map, "recordType"); + Integer isDele = FlowUtil.getPullDownInteger(map, "isDele"); + Integer contractModel = FlowUtil.getPullDownInteger(map, "contractModel"); + Integer securityType = FlowUtil.getPullDownInteger(map, "securityType"); + XzSecurityQualityInspectionRecord record = new XzSecurityQualityInspectionRecord(); + record.setRegionName(regionName); + record.setRemark(remark); + record.setDangerDesc(dangerDesc); + record.setDangerItemContent(dangerItemContent); + record.setDangerItemId(dangerItemId); + record.setDangerTypeId(dangerTypeId); + record.setLevel(level); + record.setUrgentLevel(urgentLevel); + record.setStatus(2); + record.setNotifyPerson(notifyPerson); + record.setCreatorId(creatorId); + record.setCreateTime(createTime); + record.setChangeId(changeId); + record.setChangeLimitTime(changeLimitTime); + record.setReviewId(reviewId); + record.setVerifyManId(verifyManId); + record.setInspectManId(inspectManId); + record.setInspectTime(inspectTime); + record.setRecordType(recordType); + record.setEnterpriseSn(enterpriseSn); + record.setImageUrl(imageUrl); + record.setFileUrl(fileUrl); + record.setCompleteTime(completeTime); + record.setProjectSn(projectSn); +// record.setTaskId(taskId); +// record.setItemId(itemId); + record.setAddedDescription(addedDescription); + record.setContractModel(contractModel); + record.setDeviceUnitId(deviceUnitId); + record.setProjectGroupId(projectGroupId); + record.setSupervisingUnitId(supervisingUnitId); + record.setEpcContractorId(epcContractorId); + record.setConstructionContractorId(constructionContractorId); + record.setSecurityType(securityType); + record.setSecurityRiskStatement(securityRiskStatement); + baseMapper.insert(record); + } + private void recoverScore(XzSecurityQualityInspectionRecord hiddenDangerInspectRecord) { if (hiddenDangerInspectRecord.getRecordType() == null || Objects.equals(hiddenDangerInspectRecord.getRecordType(), XzSecurityQualityInspectionRecordRecordTypeEnum.RECORD.getValue())) { return; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java similarity index 95% rename from src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java rename to src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java index 49b668b55..0bcac1aea 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.xz.security.service.impl; +package com.zhgd.xmgl.modules.baotou.security.service.impl; import cn.afterturn.easypoi.entity.ImageEntity; import cn.afterturn.easypoi.excel.ExcelExportUtil; @@ -27,17 +27,17 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord; import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityDangerItemRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityRectifyRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityRecordVo; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityQualityRectifyRecordStatusEnum; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityQualityRectifyRecordTypeEnum; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityDangerItemRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityQualityInspectionRecordMapper; -import com.zhgd.xmgl.modules.xz.security.mapper.XzSecurityQualityRectifyRecordMapper; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityRectifyRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityDangerItemRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityRectifyRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityRecordVo; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityQualityRectifyRecordStatusEnum; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityQualityRectifyRecordTypeEnum; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityDangerItemRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityQualityInspectionRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.mapper.XzSecurityQualityRectifyRecordMapper; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityRectifyRecordService; import com.zhgd.xmgl.push.config.PushPayloads; import com.zhgd.xmgl.util.TimeUtil; import org.apache.commons.collections.CollectionUtils; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java index 93c3d2d09..903b14eae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IMainProjectCompleteDetailService.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @Description: 主要工程量完成情况详情表 @@ -59,4 +60,7 @@ public interface IMainProjectCompleteDetailService extends IService param); List projectOverview(HashMap param); + + void addFromFlow(Map map); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/IProjectSupervisionMonthlyReportService.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IProjectSupervisionMonthlyReportService.java new file mode 100644 index 000000000..305bdb11c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/IProjectSupervisionMonthlyReportService.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.baotou.service; + +import com.zhgd.xmgl.modules.baotou.entity.ProjectSupervisionMonthlyReport; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 工程质量监督月报 + * @author： pds + * @date： 2024-09-29 + * @version： V1.0 + */ +public interface IProjectSupervisionMonthlyReportService extends IService { + /** + * 分页列表查询工程质量监督月报信息 + * @param param 参数map + * @return + */ + IPage queryPageList(HashMap param); + /** + * 列表查询工程质量监督月报信息 + * @param param 参数map + * @return + */ + List queryList(HashMap param); + /** + * 添加工程质量监督月报信息 + * @param projectSupervisionMonthlyReport 工程质量监督月报 + * @return + */ + void add(ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport); + /** + * 编辑工程质量监督月报信息 + * @param projectSupervisionMonthlyReport 工程质量监督月报 + * @return + */ + void edit(ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport); + /** + * 根据id删除工程质量监督月报信息 + * @param id 工程质量监督月报的id + * @return + */ + void delete(String id); + /** + * 根据id查询工程质量监督月报信息 + * @param id 工程质量监督月报的id + * @return + */ + ProjectSupervisionMonthlyReport queryById(String id); + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/DeviceMasterScheduleYearServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/DeviceMasterScheduleYearServiceImpl.java index 736c03a76..86bca70c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/DeviceMasterScheduleYearServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/DeviceMasterScheduleYearServiceImpl.java @@ -84,6 +84,7 @@ public class DeviceMasterScheduleYearServiceImpl extends ServiceImpl dealList(List list, HashMap param) { Integer levelType = MapUtils.getInteger(param, "levelType"); if (CollUtil.isNotEmpty(list)) { - List alls = baseMapper.queryAllList(param); - for (MainProjectCompleteDetailVo vo : list) { - if (Objects.equals(levelType, 2)) { - vo.setCumulativeCompletedQuantityThisMonth(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear()) && Objects.equals(o.getMonth(), vo.getMonth())).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); - } - if (Objects.equals(levelType, 2)) { - vo.setCumulativeCompletedQuantityThisYear(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear())).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); - } else { - vo.setCumulativeCompletedQuantityThisYear(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear())).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); - } - if (Objects.equals(levelType, 2)) { - vo.setCumulativeCompletedQuantity(alls.stream().filter(o -> NumberUtils.gt(o.getYear() + "", vo.getYear() + "") && (Objects.equals(o.getYear(), vo.getYear()) && NumberUtils.gt(o.getMonth() + "", vo.getMonth() + ""))).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); - } else { - vo.setCumulativeCompletedQuantity(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear())).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); - } - vo.setCumulativeArrival(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear()) && Objects.equals(o.getMonth(), vo.getMonth())).map(MainProjectCompleteDetail::getDeliveryThisPeriod).reduce(BigDecimal.ZERO, BigDecimal::add)); - } +// List alls = baseMapper.queryAllList(param); +// for (MainProjectCompleteDetailVo vo : list) { +// if (Objects.equals(levelType, 2)) { +// vo.setCumulativeCompletedQuantityThisMonth(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear()) && Objects.equals(o.getMonth(), vo.getMonth())).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); +// } +// if (Objects.equals(levelType, 2)) { +// vo.setCumulativeCompletedQuantityThisYear(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear())).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); +// } else { +// vo.setCumulativeCompletedQuantityThisYear(alls.stream().filter(o -> Objects.equals(o.getYear(), vo.getYear())).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); +// } +// if (Objects.equals(levelType, 2)) { +// vo.setCumulativeCompletedQuantity(alls.stream().filter(o -> NumberUtil.compare(o.getYear(), vo.getYear()) < 0 || (Objects.equals(o.getYear(), vo.getYear()) && NumberUtil.compare(o.getMonth(), vo.getMonth()) < 0)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); +// } else { +// vo.setCumulativeCompletedQuantity(alls.stream().filter(o -> NumberUtil.compare(o.getYear(), vo.getYear()) < 0 || (Objects.equals(o.getYear(), vo.getYear()) && NumberUtil.compare(o.getMonth(), vo.getMonth()) < 0)).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); +// } +// vo.setCumulativeArrival(alls.stream().filter(o -> NumberUtil.compare(o.getYear(), vo.getYear()) < 0 || (Objects.equals(o.getYear(), vo.getYear()) && NumberUtil.compare(o.getMonth(), vo.getMonth()) < 0)).map(MainProjectCompleteDetail::getDeliveryThisPeriod).reduce(BigDecimal.ZERO, BigDecimal::add)); +// } } return list; } @@ -129,26 +128,27 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl alls = baseMapper.queryAllList(param); + HashMap p1 = ObjectUtil.cloneByStream(param); + p1.put("mainProjectCompletePeriodId", null); + List alls = baseMapper.queryAllList(p1); List nameList = mainProjectCompleteNameService.list(new LambdaQueryWrapper() .eq(MainProjectCompleteName::getProjectSn, projectSn) .eq(StrUtil.isNotBlank(projectQuantityName), MainProjectCompleteName::getProjectQuantityName, projectQuantityName) @@ -179,18 +181,22 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl list = new ArrayList<>(); for (MainProjectCompleteName name : nameList) { MainProjectCompleteDetailVo vo = new MainProjectCompleteDetailVo(); BeanUtil.copyProperties(name, vo); vo.setMainProjectCompleteNameId(vo.getId()); - Optional op = alls.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId()) && Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst(); + List filterAlls = alls.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId())).collect(Collectors.toList()); + Optional op = filterAlls.stream().filter(o -> Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst(); if (op.isPresent()) { BeanUtil.copyProperties(op.get(), vo); } else { @@ -201,19 +207,23 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl Objects.equals(o.getYear(), finalYear) && Objects.equals(o.getMonth(), finalMonth)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); + vo.setCumulativeCompletedQuantityThisMonth(filterAlls.stream().filter(o -> Objects.equals(o.getYear(), finalYear) && Objects.equals(o.getMonth(), finalMonth) && isLessOrEqual(o, finalYear, finalMonth, finalWhichWeek)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); } - if (Objects.equals(levelType, 2)) { - vo.setCumulativeCompletedQuantityThisYear(alls.stream().filter(o -> Objects.equals(o.getYear(), finalYear)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); - } else { - vo.setCumulativeCompletedQuantityThisYear(alls.stream().filter(o -> Objects.equals(o.getYear(), finalYear)).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); - } - if (Objects.equals(levelType, 2)) { - vo.setCumulativeCompletedQuantity(alls.stream().filter(o -> NumberUtils.gt(o.getYear() + "", finalYear + "") && (Objects.equals(o.getYear(), finalYear) && NumberUtils.gt(o.getMonth() + "", finalMonth + ""))).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); - } else { - vo.setCumulativeCompletedQuantity(alls.stream().filter(o -> Objects.equals(o.getYear(), finalYear)).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); - } - vo.setCumulativeArrival(alls.stream().filter(o -> Objects.equals(o.getYear(), finalYear) && Objects.equals(o.getMonth(), finalMonth)).map(MainProjectCompleteDetail::getDeliveryThisPeriod).reduce(BigDecimal.ZERO, BigDecimal::add)); + vo.setCumulativeCompletedQuantityThisYear(filterAlls.stream().filter(o -> Objects.equals(o.getYear(), finalYear) && isLessOrEqual(o, finalYear, finalMonth, finalWhichWeek)).map(mainProjectCompleteDetailVo -> { + if (Objects.equals(levelType, 2)) { + return mainProjectCompleteDetailVo.getCompletedQuantityThisWeek(); + } else { + return mainProjectCompleteDetailVo.getCompletedQuantityThisMonth(); + } + }).reduce(BigDecimal.ZERO, BigDecimal::add)); + vo.setCumulativeCompletedQuantity(filterAlls.stream().filter(o -> isLessOrEqual(o, finalYear, finalMonth, finalWhichWeek)).map(mainProjectCompleteDetailVo -> { + if (Objects.equals(levelType, 2)) { + return mainProjectCompleteDetailVo.getCompletedQuantityThisWeek(); + } else { + return mainProjectCompleteDetailVo.getCompletedQuantityThisMonth(); + } + }).reduce(BigDecimal.ZERO, BigDecimal::add)); + vo.setCumulativeArrival(filterAlls.stream().filter(o -> isLessOrEqual(o, finalYear, finalMonth, finalWhichWeek)).map(MainProjectCompleteDetail::getDeliveryThisPeriod).reduce(BigDecimal.ZERO, BigDecimal::add)); list.add(vo); } int pageNo = Integer.parseInt(param.getOrDefault("pageNo", 1).toString()); @@ -231,15 +241,20 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl param) { String deviceUnitIds = MapUtils.getString(param, "deviceUnitIds"); + String projectSn = MapUtils.getString(param, "projectSn"); String mainProjectCompletePeriodId = MapUtils.getString(param, "mainProjectCompletePeriodId"); Integer levelType = MapUtils.getInteger(param, "levelType"); - if (StrUtil.isBlank(deviceUnitIds) || StrUtil.isBlank(mainProjectCompletePeriodId) || levelType == null) { - throw new OpenAlertException("deviceUnitIds和mainProjectCompletePeriodId和levelType不能为空"); + if (StrUtil.isBlank(projectSn) || StrUtil.isBlank(deviceUnitIds) || StrUtil.isBlank(mainProjectCompletePeriodId) || levelType == null) { + throw new OpenAlertException("projectSn、deviceUnitIds、mainProjectCompletePeriodId、levelType不能为空"); } - MainProjectCompletePeriod completePeriod = mainProjectCompletePeriodService.getById(mainProjectCompletePeriodId); + MainProjectCompletePeriod completePeriod = mainProjectCompletePeriodService.queryById(mainProjectCompletePeriodId); List periodList = mainProjectCompletePeriodService.list(new LambdaQueryWrapper() .eq(MainProjectCompletePeriod::getLevelType, levelType) .eq(MainProjectCompletePeriod::getYear, completePeriod.getYear()) @@ -247,11 +262,11 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl detailVos = baseMapper.queryAllList(param); - param.put("mainProjectCompletePeriodId", null); - List allDetailVos = baseMapper.queryAllList(param); + HashMap p1 = ObjectUtil.cloneByStream(param); + p1.put("mainProjectCompletePeriodId", null); + List allDetailVos = baseMapper.queryAllList(p1); List nameList = mainProjectCompleteNameService.list(new LambdaQueryWrapper() - .eq(MainProjectCompleteName::getProjectSn, periodList.get(0).getProjectSn())); + .eq(MainProjectCompleteName::getProjectSn, projectSn)); List treeNames = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(nameList)), "id", "parentId", "children"), MainProjectCompleteName.class); List totalList = mainProjectCompleteTotalService.list(new LambdaQueryWrapper() .in(MainProjectCompleteTotal::getDeviceUnitId, StrUtil.split(deviceUnitIds, ","))); @@ -265,51 +280,24 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl map = new LinkedHashMap<>(); List> listMap = new ArrayList<>(); Integer i = 0; - this.setMapByListTree(treeNames, listMap, detailVos, allDetailVos, totalList, period, i, levelType); + DeviceUnit deviceUnit = unitList.stream().filter(o -> Objects.equals(o.getId(), period.getDeviceUnitId())).findFirst().get(); + String name = deviceUnit.getDeviceUnitName(); + this.setMapByListTree(treeNames, listMap, allDetailVos, totalList, period, i, levelType); map.put("listMap", listMap); - map.put(SHEET_NAME, unitList.stream().filter(o -> Objects.equals(o.getId(), period.getDeviceUnitId())).findFirst().get().getDeviceUnitName()); + map.put("subTitle", StrUtil.format("装置/单元工程：{} 截止日期：XXX年XX月XX日 项目建设{}次：{} 填报单位： XXX单位", name, Objects.equals(levelType, 1) ? "月" : "周", period.getYear() + "-" + period.getMonth() + this.getWeekName(period))); + map.put(SHEET_NAME, name); sheetList.add(map); } //汇总 - int i = 0; - HashMap totalMap = new HashMap<>(); - List> totalListMap = new ArrayList<>(); - totalMap.put("listMap", totalListMap); - totalMap.put(SHEET_NAME, "汇总表"); - for (MainProjectCompleteName name : nameList) { - BigDecimal totalDesignQuantity = new BigDecimal("0"); - BigDecimal completedQuantityThisMonth = new BigDecimal("0"); - BigDecimal cumulativeCompletedQuantityThisYear = new BigDecimal("0"); - BigDecimal cumulativeCompletedQuantity = new BigDecimal("0"); - BigDecimal deliveryThisPeriod = new BigDecimal("0"); - BigDecimal cumulativeArrival = new BigDecimal("0"); - Map mp = new HashMap<>(); - mp.put("projectQuantityName", name.getProjectQuantityName()); - if (Objects.equals(name.getLevel(), 1)) { - mp.put("number", ++i); - } else { - mp.put("number", null); - } - for (Map map : sheetList) { - List> listMap = (List>) map.get("listMap"); - Map m = listMap.stream().filter(o -> Objects.equals(o.get("mainProjectCompleteNameId"), name.getId())).findFirst().get(); - totalDesignQuantity = NumberUtil.add(totalDesignQuantity, Convert.toBigDecimal(m.get("totalDesignQuantity"))); - completedQuantityThisMonth = NumberUtil.add(completedQuantityThisMonth, Convert.toBigDecimal(m.get("completedQuantityThisMonth"))); - cumulativeCompletedQuantityThisYear = NumberUtil.add(cumulativeCompletedQuantityThisYear, Convert.toBigDecimal(m.get("cumulativeCompletedQuantityThisYear"))); - cumulativeCompletedQuantity = NumberUtil.add(cumulativeCompletedQuantity, Convert.toBigDecimal(m.get("cumulativeCompletedQuantity"))); - deliveryThisPeriod = NumberUtil.add(deliveryThisPeriod, Convert.toBigDecimal(m.get("deliveryThisPeriod"))); - cumulativeArrival = NumberUtil.add(cumulativeArrival, Convert.toBigDecimal(m.get("cumulativeArrival"))); - } - mp.put("totalDesignQuantity", totalDesignQuantity); - mp.put("completedQuantityThisMonth", completedQuantityThisMonth); - mp.put("cumulativeCompletedQuantityThisYear", cumulativeCompletedQuantityThisYear); - mp.put("cumulativeCompletedQuantity", cumulativeCompletedQuantity); - mp.put("deliveryThisPeriod", deliveryThisPeriod); - mp.put("cumulativeArrival", cumulativeArrival); - } + HashMap totalMap = getTotalMap(levelType, periodList, nameList, sheetList); sheetList.add(0, totalMap); - File out = FileUtil.file("C:\\Users\\GUO\\Desktop\\mm.xlsx"); -// File out = Fileutils.getExportExcelTemplateFile("excel/焊接记录导出模版.xlsx"); +// File out = FileUtil.file("C:\\Users\\Administrator\\Desktop\\mm.xlsx"); + File out; + if (levelType == 1) { + out = Fileutils.getExportExcelTemplateFile("excel/主要工程量完成情况记录月计划导出模板.xlsx"); + } else { + out = Fileutils.getExportExcelTemplateFile("excel/主要工程量完成情况记录周计划导出模板.xlsx"); + } TemplateExportParams params = new TemplateExportParams(out.getAbsolutePath()); Workbook workbook = ExcelExportUtil.exportExcelClone(realMap, params); ExcelUtils.downLoadExcel("主要工程量完成情况记录.xlsx", response, workbook); @@ -319,60 +307,201 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl getTotalMap(Integer levelType, List periodList, List nameList, List> sheetList) { + int i = 0; + List> totalListMap = new ArrayList<>(); + HashMap totalMap = new HashMap<>(); + totalMap.put("listMap", totalListMap); + MainProjectCompletePeriod period = periodList.get(0); + totalMap.put("subTitle", StrUtil.format("装置/单元工程：全部装置 截止日期：XXX年XX月XX日 项目建设{}次：{} 填报单位： XXX单位", Objects.equals(levelType, 1) ? "月" : "周", period.getYear() + "-" + period.getMonth() + this.getWeekName(period))); + totalMap.put(SHEET_NAME, "汇总表"); + List> oneListMap = (List>) sheetList.get(0).get("listMap"); + for (int j = 0; j < oneListMap.size(); j++) { + BigDecimal totalDesignQuantity = new BigDecimal("0"); + BigDecimal completedQuantityThisWeek = new BigDecimal("0"); + BigDecimal completedQuantityThisMonth = new BigDecimal("0"); + BigDecimal cumulativeCompletedQuantityThisYear = new BigDecimal("0"); + BigDecimal cumulativeCompletedQuantity = new BigDecimal("0"); + BigDecimal deliveryThisPeriod = new BigDecimal("0"); + BigDecimal cumulativeArrival = new BigDecimal("0"); + Map mp = new HashMap<>(); + Map value = oneListMap.get(j); + mp.put("projectQuantityName", value.get("projectQuantityName")); + mp.put("number", value.get("number")); + for (Map map : sheetList) { + List> listMap = (List>) map.get("listMap"); + Map m = listMap.get(j); + totalDesignQuantity = NumberUtil.add(totalDesignQuantity, Convert.toBigDecimal(m.get("totalDesignQuantity"))); + completedQuantityThisWeek = NumberUtil.add(completedQuantityThisWeek, Convert.toBigDecimal(m.get("completedQuantityThisWeek"))); + completedQuantityThisMonth = NumberUtil.add(completedQuantityThisMonth, Convert.toBigDecimal(m.get("completedQuantityThisMonth"))); + cumulativeCompletedQuantityThisYear = NumberUtil.add(cumulativeCompletedQuantityThisYear, Convert.toBigDecimal(m.get("cumulativeCompletedQuantityThisYear"))); + cumulativeCompletedQuantity = NumberUtil.add(cumulativeCompletedQuantity, Convert.toBigDecimal(m.get("cumulativeCompletedQuantity"))); + deliveryThisPeriod = NumberUtil.add(deliveryThisPeriod, Convert.toBigDecimal(m.get("deliveryThisPeriod"))); + cumulativeArrival = NumberUtil.add(cumulativeArrival, Convert.toBigDecimal(m.get("cumulativeArrival"))); + } + mp.put("totalDesignQuantity", totalDesignQuantity); + mp.put("completedQuantityThisWeek", completedQuantityThisWeek); + mp.put("completedQuantityThisMonth", completedQuantityThisMonth); + mp.put("cumulativeCompletedQuantityThisYear", cumulativeCompletedQuantityThisYear); + mp.put("cumulativeCompletedQuantity", cumulativeCompletedQuantity); + mp.put("deliveryThisPeriod", deliveryThisPeriod); + mp.put("cumulativeArrival", cumulativeArrival); + totalListMap.add(mp); + } + return totalMap; + } + + private String getWeekName(MainProjectCompletePeriod period) { + if (period.getLevelType().equals(2)) { + Integer whichWeek = period.getWhichWeek(); + String name = ""; + switch (whichWeek) { + case 1: + name = "一"; + break; + case 2: + name = "二"; + break; + case 3: + name = "三"; + break; + case 4: + name = "四"; + break; + } + return "第" + name + "周"; + } else { + return ""; + } + } + @Override public List projectOverview(HashMap param) { String projectSn = MapUtils.getString(param, "projectSn"); String deviceUnitId = MapUtils.getString(param, "deviceUnitId"); List treeNames = getNameVos(projectSn); param.put("levelType", 1); + List totalList = mainProjectCompleteTotalService.list(new LambdaQueryWrapper() + .eq(MainProjectCompleteTotal::getProjectSn, projectSn) + .eq(StrUtil.isNotBlank(deviceUnitId), MainProjectCompleteTotal::getDeviceUnitId, deviceUnitId) + ); List detailList = mainProjectCompleteDetailMapper.queryAllList(param); - addChildrenList(treeNames, detailList); + List periodList = mainProjectCompletePeriodService.list(new LambdaQueryWrapper() + .eq(MainProjectCompletePeriod::getProjectSn, projectSn) + .eq(MainProjectCompletePeriod::getLevelType, 1) + .eq(StrUtil.isNotBlank(deviceUnitId), MainProjectCompletePeriod::getDeviceUnitId, deviceUnitId) + ); + List overviewYears = periodList.stream().map(MainProjectCompletePeriod::getYear).distinct().sorted(Integer::compareTo).collect(Collectors.toList()); + addChildrenList(treeNames, detailList, totalList, overviewYears); return treeNames; } - @NotNull + @Override + @Transactional(rollbackFor = Exception.class) + public void addFromFlow(Map map) { + Long deviceUnitId = FlowUtil.getPullDownLong(map, "deviceUnitId"); + Long mainProjectCompleteNameId = FlowUtil.getPullDownLong(map, "mainProjectCompleteNameId"); + String yearMonth = FlowUtil.getString(map, "yearMonth"); + Integer year = Convert.toInt(yearMonth.split("-")[0]); + Integer month = Convert.toInt(yearMonth.split("-")[1]); + Integer whichWeek = FlowUtil.getPullDownInteger(map, "whichWeek"); + Integer levelType = MapUtils.getInteger(map, "levelType"); + BigDecimal completedQuantityThisMonth = Convert.toBigDecimal(FlowUtil.getString(map, "completedQuantityThisMonth")); + BigDecimal completedQuantityThisWeek = Convert.toBigDecimal(FlowUtil.getString(map, "completedQuantityThisWeek")); + BigDecimal deliveryThisPeriod = Convert.toBigDecimal(FlowUtil.getString(map, "deliveryThisPeriod")); + String projectSn = FlowUtil.getString(map, "projectSn"); + MainProjectCompleteDetailVo vo = new MainProjectCompleteDetailVo(); + vo.setDeviceUnitId(deviceUnitId); + vo.setMainProjectCompleteNameId(mainProjectCompleteNameId); + vo.setYear(year); + vo.setMonth(month); + vo.setWhichWeek(whichWeek); + vo.setLevelType(levelType); + vo.setCompletedQuantityThisMonth(completedQuantityThisMonth); + vo.setCompletedQuantityThisWeek(completedQuantityThisWeek); + vo.setDeliveryThisPeriod(deliveryThisPeriod); + vo.setProjectSn(projectSn); + + MainProjectCompletePeriod period = mainProjectCompletePeriodService.getOne(new LambdaQueryWrapper() + .eq(MainProjectCompletePeriod::getProjectSn, projectSn) + .eq(MainProjectCompletePeriod::getDeviceUnitId, deviceUnitId) + .eq(MainProjectCompletePeriod::getYear, year) + .eq(MainProjectCompletePeriod::getMonth, month) + .eq(MainProjectCompletePeriod::getLevelType, levelType) + .eq(Objects.equals(levelType, 2), MainProjectCompletePeriod::getWhichWeek, whichWeek) + ); + if (period == null) { + period = new MainProjectCompletePeriod(); + period.setDeviceUnitId(deviceUnitId); + period.setYear(year); + period.setMonth(month); + period.setWhichWeek(whichWeek); + period.setLevelType(levelType); + period.setProjectSn(projectSn); + mainProjectCompletePeriodService.save(period); + } + vo.setMainProjectCompletePeriodId(period.getId()); + + MainProjectCompleteDetail old = baseMapper.selectOne(new LambdaQueryWrapper() + .eq(MainProjectCompleteDetail::getProjectSn, projectSn) + .eq(MainProjectCompleteDetail::getMainProjectCompleteNameId, mainProjectCompleteNameId) + .eq(MainProjectCompleteDetail::getMainProjectCompletePeriodId, period.getId()) + .eq(MainProjectCompleteDetail::getDeviceUnitId, deviceUnitId) + ); + if (old != null) { + vo.setId(old.getId()); + baseMapper.updateById(vo); + } else { + baseMapper.insert(vo); + } + + } + private List getNameVos(String projectSn) { List nameList = mainProjectCompleteNameService.list(new LambdaQueryWrapper() .eq(MainProjectCompleteName::getProjectSn, projectSn)); - JSONArray ja = ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(nameList)), "id", "parentId", "children"); - List treeNames = new ArrayList<>(); - for (int i = 0; i < ja.size(); i++) { + List vos = new ArrayList<>(); + for (MainProjectCompleteName name : nameList) { MainProjectCompleteDetailVo vo = new MainProjectCompleteDetailVo(); - BeanUtil.copyProperties(ja.getJSONObject(i), vo); + BeanUtil.copyProperties(name, vo); vo.setMainProjectCompleteNameId(vo.getId()); - treeNames.add(vo); + vo.setId(null); + vos.add(vo); } - return treeNames; + return BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(vos)), "mainProjectCompleteNameId", "parentId", "children"), MainProjectCompleteDetailVo.class); } - private void addChildrenList(List treeNames, List detailList) { + private void addChildrenList(List treeNames, List detailList, List totalList, List overviewYears) { for (MainProjectCompleteDetailVo name : treeNames) { List nameDetails = detailList.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), name.getMainProjectCompleteNameId())).collect(Collectors.toList()); - Map> yearMap = nameDetails.stream().sorted(Comparator.comparing(MainProjectCompleteDetailVo::getYear)).collect(Collectors.groupingBy(MainProjectCompleteDetailVo::getYear)); - ArrayList> overviewList = new ArrayList<>(); - for (Map.Entry> entry : yearMap.entrySet()) { - Integer thisYear = entry.getKey(); - List ds = entry.getValue(); + List> overviewList = new ArrayList<>(); + for (Integer thisYear : overviewYears) { + List thisYears = nameDetails.stream().filter(o -> Objects.equals(o.getYear(), thisYear)).collect(Collectors.toList()); LinkedHashMap map = new LinkedHashMap<>(); - List thisYears = ds.stream().filter(o -> Objects.equals(o.getYear(), thisYear)).collect(Collectors.toList()); - map.put(thisYear + "年累积完成量", thisYears.stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); - Map> monthMap = thisYears.stream().sorted(Comparator.comparing(MainProjectCompleteDetailVo::getMonth)).collect(Collectors.groupingBy(MainProjectCompleteDetailVo::getMonth)); + map.put("yearName", thisYear + "年累积完成量"); + map.put("yearValue", thisYears.stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); ArrayList> months = new ArrayList<>(); - for (Map.Entry> monthEntry : monthMap.entrySet()) { + for (int month = 1; month <= 12; month++) { LinkedHashMap m = new LinkedHashMap<>(); - m.put("name", monthEntry.getKey()); - m.put("value", monthEntry.getValue().stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); + m.put("name", month); + int finalMonth = month; + List list = thisYears.stream().filter(o -> Objects.equals(o.getMonth(), finalMonth)).collect(Collectors.toList()); + m.put("value", list.stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add)); months.add(m); } map.put("monthList", months); overviewList.add(map); } name.setOverviewList(overviewList); - addChildrenList(name.getChildren(), detailList); + BigDecimal totalDesignQuantity = totalList.stream().filter(o -> Objects.equals(name.getMainProjectCompleteNameId(), o.getMainProjectCompleteNameId())).map(MainProjectCompleteTotal::getTotalDesignQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); + name.setTotalDesignQuantity(totalDesignQuantity); + BigDecimal cumulativeCompletedQuantity = nameDetails.stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add); + name.setCumulativeCompletedQuantity(cumulativeCompletedQuantity); + addChildrenList(name.getChildren(), detailList, totalList, overviewYears); } } - private void setMapByListTree(List treeNames, List> listMap, List detailVos, List allDetailVos, List totalList, MainProjectCompletePeriod period, Integer i, Integer levelType) { + private void setMapByListTree(List treeNames, List> listMap, List alls, List totalList, MainProjectCompletePeriod period, Integer i, Integer levelType) { for (MainProjectCompleteName name : treeNames) { BigDecimal cumulativeCompletedQuantityThisYear = null; BigDecimal cumulativeCompletedQuantity = null; @@ -380,50 +509,63 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl op = detailVos.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), name.getId()) && Objects.equals(o.getDeviceUnitId(), period.getDeviceUnitId())).findFirst(); + Integer whichWeek = period.getWhichWeek(); + MainProjectCompleteDetailVo vo = new MainProjectCompleteDetailVo(); + BeanUtil.copyProperties(name, vo); + vo.setMainProjectCompleteNameId(vo.getId()); + List filterAlls = alls.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId())).collect(Collectors.toList()); + Optional op = filterAlls.stream().filter(o -> Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst(); if (op.isPresent()) { - MainProjectCompleteDetailVo vo = op.get(); + BeanUtil.copyProperties(op.get(), vo); completedQuantityThisMonth = vo.getCompletedQuantityThisMonth(); deliveryThisPeriod = vo.getDeliveryThisPeriod(); + completedQuantityThisWeek = vo.getCompletedQuantityThisWeek(); + } else { + vo.setId(null); } - Optional op1 = totalList.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), name.getId()) && Objects.equals(o.getDeviceUnitId(), period.getDeviceUnitId())).findFirst(); + if (Objects.equals(levelType, 2)) { + completedQuantityThisMonth = filterAlls.stream().filter(o -> Objects.equals(o.getYear(), year) && Objects.equals(o.getMonth(), month) && isLessOrEqual(o, year, month, whichWeek)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add); + } + Optional op1 = totalList.stream().filter(o -> Objects.equals(o.getDeviceUnitId(), period.getDeviceUnitId()) && Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId())).findFirst(); if (op1.isPresent()) { totalDesignQuantity = op1.get().getTotalDesignQuantity(); } -// if (Objects.equals(levelType, 2)) { -// vo.setCumulativeCompletedQuantityThisMonth(alls.stream().filter(o -> Objects.equals(o.getYear(), year) && Objects.equals(o.getMonth(), month)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add)); -// } - if (Objects.equals(levelType, 2)) { - cumulativeCompletedQuantityThisYear = allDetailVos.stream().filter(o -> Objects.equals(o.getYear(), year)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add); - } else { - cumulativeCompletedQuantityThisYear = allDetailVos.stream().filter(o -> Objects.equals(o.getYear(), year)).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add); - } - if (Objects.equals(levelType, 2)) { - cumulativeCompletedQuantity = allDetailVos.stream().filter(o -> NumberUtil.compare(o.getYear(), year) < 0 && (Objects.equals(o.getYear(), year) && NumberUtil.compare(o.getMonth(), month) < 0)).map(MainProjectCompleteDetail::getCompletedQuantityThisWeek).reduce(BigDecimal.ZERO, BigDecimal::add); - } else { - cumulativeCompletedQuantity = allDetailVos.stream().filter(o -> NumberUtil.compare(o.getYear(), year) < 0 && (Objects.equals(o.getYear(), year) && NumberUtil.compare(o.getMonth(), month) < 0)).map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add); - } - cumulativeArrival = allDetailVos.stream().filter(o -> Objects.equals(o.getYear(), year) && Objects.equals(o.getMonth(), month)).map(MainProjectCompleteDetail::getDeliveryThisPeriod).reduce(BigDecimal.ZERO, BigDecimal::add); - + cumulativeCompletedQuantityThisYear = filterAlls.stream().filter(o -> Objects.equals(period.getDeviceUnitId(), o.getDeviceUnitId()) && Objects.equals(o.getYear(), year) && isLessOrEqual(o, year, month, whichWeek)).map(mainProjectCompleteDetailVo -> { + if (Objects.equals(levelType, 2)) { + return mainProjectCompleteDetailVo.getCompletedQuantityThisWeek(); + } else { + return mainProjectCompleteDetailVo.getCompletedQuantityThisMonth(); + } + }).reduce(BigDecimal.ZERO, BigDecimal::add); + cumulativeCompletedQuantity = filterAlls.stream().filter(o -> Objects.equals(period.getDeviceUnitId(), o.getDeviceUnitId()) && Objects.equals(o.getMainProjectCompletePeriodId(), period.getId()) && isLessOrEqual(o, year, month, whichWeek)).map(mainProjectCompleteDetailVo -> { + if (Objects.equals(levelType, 2)) { + return mainProjectCompleteDetailVo.getCompletedQuantityThisWeek(); + } else { + return mainProjectCompleteDetailVo.getCompletedQuantityThisMonth(); + } + }).reduce(BigDecimal.ZERO, BigDecimal::add); + cumulativeArrival = filterAlls.stream().filter(o -> Objects.equals(period.getDeviceUnitId(), o.getDeviceUnitId()) && isLessOrEqual(o, year, month, whichWeek)).map(MainProjectCompleteDetail::getDeliveryThisPeriod).reduce(BigDecimal.ZERO, BigDecimal::add); Map mp = new HashMap<>(); - if (Objects.equals(name.getLevel(), 1)) { + if (Objects.equals(vo.getLevel(), 1)) { mp.put("number", ++i); } else { mp.put("number", null); } - mp.put("projectQuantityName", name.getProjectQuantityName()); + mp.put("projectQuantityName", vo.getProjectQuantityName()); mp.put("totalDesignQuantity", totalDesignQuantity); + mp.put("completedQuantityThisWeek", completedQuantityThisWeek); mp.put("completedQuantityThisMonth", completedQuantityThisMonth); mp.put("cumulativeCompletedQuantityThisYear", cumulativeCompletedQuantityThisYear); mp.put("cumulativeCompletedQuantity", cumulativeCompletedQuantity); mp.put("deliveryThisPeriod", deliveryThisPeriod); mp.put("cumulativeArrival", cumulativeArrival); - mp.put("mainProjectCompleteNameId", name.getId()); - mp.put("level", name.getLevel()); + mp.put("mainProjectCompleteNameId", vo.getMainProjectCompleteNameId()); + mp.put("level", vo.getLevel()); listMap.add(mp); - setMapByListTree(name.getChildren(), listMap, detailVos, allDetailVos, totalList, period, i, levelType); + setMapByListTree(name.getChildren(), listMap, alls, totalList, period, i, levelType); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompletePeriodServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompletePeriodServiceImpl.java index 116b2e520..e63c65a08 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompletePeriodServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompletePeriodServiceImpl.java @@ -1,37 +1,38 @@ package com.zhgd.xmgl.modules.baotou.service.impl; -import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.xmgl.modules.baotou.entity.MainProjectCompletePeriod; -import com.zhgd.xmgl.modules.baotou.mapper.MainProjectCompletePeriodMapper; -import com.zhgd.xmgl.modules.baotou.service.IMainProjectCompletePeriodService; -import org.springframework.stereotype.Service; 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.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.baotou.entity.MainProjectCompletePeriod; +import com.zhgd.xmgl.modules.baotou.mapper.MainProjectCompletePeriodMapper; +import com.zhgd.xmgl.modules.baotou.service.IMainProjectCompletePeriodService; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.HashMap; import java.util.List; -import com.zhgd.xmgl.util.RefUtil; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.beans.factory.annotation.Autowired; /** * @Description: 主要工程量完成情况时间段 * @author： pds - * @date： 2024-09-26 + * @date： 2024-09-26 * @version： V1.0 */ @Service public class MainProjectCompletePeriodServiceImpl extends ServiceImpl implements IMainProjectCompletePeriodService { @Autowired private MainProjectCompletePeriodMapper mainProjectCompletePeriodMapper; + @Override public IPage queryPageList(HashMap param) { QueryWrapper queryWrapper = this.getQueryWrapper(param); Page page = PageUtil.getPage(param); - IPage pageList = baseMapper.queryList(page, queryWrapper,param); + IPage pageList = baseMapper.queryList(page, queryWrapper, param); pageList.setRecords(this.dealList(pageList.getRecords())); return pageList; } @@ -39,12 +40,12 @@ public class MainProjectCompletePeriodServiceImpl extends ServiceImpl queryList(HashMap param) { QueryWrapper queryWrapper = getQueryWrapper(param); - return dealList(baseMapper.queryList(queryWrapper,param)); + return dealList(baseMapper.queryList(queryWrapper, param)); } private QueryWrapper getQueryWrapper(HashMap param) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(MainProjectCompletePeriod.class, param, true); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(MainProjectCompletePeriod::getId)); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(MainProjectCompletePeriod::getYear), RefUtil.fieldNameUlc(MainProjectCompletePeriod::getMonth), RefUtil.fieldNameUlc(MainProjectCompletePeriod::getWhichWeek)); return queryWrapper; } @@ -61,7 +62,7 @@ public class MainProjectCompletePeriodServiceImpl extends ServiceImpl implements IProjectSupervisionMonthlyReportService { + @Autowired + private ProjectSupervisionMonthlyReportMapper projectSupervisionMonthlyReportMapper; + @Override + public IPage queryPageList(HashMap param) { + QueryWrapper queryWrapper = this.getQueryWrapper(param); + Page page = PageUtil.getPage(param); + IPage pageList = baseMapper.queryList(page, queryWrapper,param); + pageList.setRecords(this.dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap param) { + QueryWrapper queryWrapper = getQueryWrapper(param); + return dealList(baseMapper.queryList(queryWrapper,param)); + } + + private QueryWrapper getQueryWrapper(HashMap param) { + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectSupervisionMonthlyReport.class, param, true); + queryWrapper.orderByDesc(RefUtil.fieldNameUlc(ProjectSupervisionMonthlyReport::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport) { + projectSupervisionMonthlyReport.setId(null); + baseMapper.insert(projectSupervisionMonthlyReport); + } + + @Override + public void edit(ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport) { + ProjectSupervisionMonthlyReport oldProjectSupervisionMonthlyReport = baseMapper.selectById(projectSupervisionMonthlyReport.getId()); + if(oldProjectSupervisionMonthlyReport==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(projectSupervisionMonthlyReport); + } + + @Override + public void delete(String id) { + ProjectSupervisionMonthlyReport projectSupervisionMonthlyReport = baseMapper.selectById(id); + if(projectSupervisionMonthlyReport==null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + @Override + public ProjectSupervisionMonthlyReport queryById(String id) { + ProjectSupervisionMonthlyReport entity = baseMapper.queryById(id); + if (entity == null) { + throw new OpenAlertException("未找到对应实体"); + } + return entity; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java index f29acaed8..859f67b3a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyBigScreenStatisticsServiceImpl.java @@ -23,7 +23,7 @@ import com.zhgd.xmgl.modules.video.mapper.VideoAlarmMapper; import com.zhgd.xmgl.modules.water.mapper.WaterMeterMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerAttendanceMapper; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo; import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java index b30b3b1a4..1aca40bc2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java @@ -55,9 +55,9 @@ import com.zhgd.xmgl.modules.worker.service.IUserEnterpriseService; import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl; import com.zhgd.xmgl.modules.xz.entity.XzRegistry; import com.zhgd.xmgl.modules.xz.mapper.XzRegistryMapper; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityQualityInspectionRecordStatusEnum; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.enums.XzSecurityQualityInspectionRecordStatusEnum; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.service.impl.XzRegistryServiceImpl; import com.zhgd.xmgl.security.JwtTokenProvider; import com.zhgd.xmgl.security.entity.UserInfo; diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java index 74d3c2b8c..293f69497 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/IDangerousEngineeringRecordService.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.GetStatScoreVo; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.GetStatScoreVo; import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo; import java.util.Date; diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java index 62f39c5ee..17db3f322 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java @@ -26,9 +26,9 @@ import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringSideStationS import com.zhgd.xmgl.modules.dangerous.service.IHiddenDangerInspectRecordService; import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper; import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.entity.vo.GetStatScoreVo; -import com.zhgd.xmgl.modules.xz.security.service.IXzSecurityQualityInspectionRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.XzSecurityQualityInspectionRecord; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.GetStatScoreVo; +import com.zhgd.xmgl.modules.baotou.security.service.IXzSecurityQualityInspectionRecordService; import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService; import com.zhgd.xmgl.modules.xz.special.entity.vo.CountSpecialByFinalStatusVo; import com.zhgd.xmgl.util.MapBuilder; diff --git a/src/main/java/com/zhgd/xmgl/modules/inspection/entity/vo/InspectTaskRecordVo.java b/src/main/java/com/zhgd/xmgl/modules/inspection/entity/vo/InspectTaskRecordVo.java index cd4738cb1..4bd2f9fc6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/inspection/entity/vo/InspectTaskRecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/inspection/entity/vo/InspectTaskRecordVo.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.inspection.entity.vo; import com.zhgd.xmgl.modules.inspection.entity.InspectTaskRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/zhgd/xmgl/modules/inspection/service/impl/InspectTaskRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/inspection/service/impl/InspectTaskRecordServiceImpl.java index f7c7d1c0a..6f578e8e4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/inspection/service/impl/InspectTaskRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/inspection/service/impl/InspectTaskRecordServiceImpl.java @@ -20,9 +20,6 @@ import com.zhgd.xmgl.modules.inspection.mapper.InspectTaskRecordMapper; import com.zhgd.xmgl.modules.inspection.service.IInspectTaskRecordService; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityInspectTaskItemRecord; -import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord; -import com.zhgd.xmgl.modules.xz.security.enums.XzSecurityInspectTaskRecordFrequencyTypeEnum; import com.zhgd.xmgl.util.DateUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java index 5b535557a..a774bdaa0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java @@ -1,20 +1,16 @@ package com.zhgd.xmgl.modules.quality.controller; -import cn.hutool.core.date.DateUtil; 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.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; -import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.*; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; -import com.zhgd.xmgl.modules.quality.entity.dto.DepartmentRectifiedRankDto; import com.zhgd.xmgl.modules.quality.entity.vo.*; import com.zhgd.xmgl.modules.quality.service.IQualityInspectionRecordService; -import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.*; +import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -27,8 +23,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import java.math.BigDecimal; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java index 998ea1811..9c8c9f207 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/entity/vo/RecordVo.java @@ -1,8 +1,7 @@ package com.zhgd.xmgl.modules.quality.entity.vo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.mybatis.EntityMap; -import com.zhgd.xmgl.modules.xz.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.XzSecurityQualityInspectionRecordTotalVo; import lombok.Data; @Data diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java index 0967f0f96..1f3fadfb5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/QualityInspectionRecordMapper.java @@ -6,10 +6,10 @@ import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.baotou.security.entity.vo.*; import com.zhgd.xmgl.modules.quality.entity.QualityInspectionRecord; import com.zhgd.xmgl.modules.quality.entity.vo.QualityInspectionRecordVo; -import com.zhgd.xmgl.modules.xz.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; -import com.zhgd.xmgl.modules.xz.security.entity.vo.*; +import com.zhgd.xmgl.modules.baotou.security.entity.dto.XzSecurityDepartmentRectifiedRankDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml index 7cd67b7a5..ba451cdef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml @@ -395,7 +395,7 @@ order by a.inspect_time desc, a.id desc @@ -507,7 +507,7 @@ - select COUNT(1) allTotal, @@ -557,8 +557,8 @@ WHERE a.project_sn = #{projectSn} - select t.*, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) rectifiedNumRatio, @@ -646,7 +646,7 @@ group by enumType - select t.*, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) rectifiedNumRatio, @@ -674,7 +674,7 @@ order by rectifiedNum desc) t - select t.*, round(IFNULL(TRUNCATE(IFNULL(t.rectifiedNum, 0) / IFNULL(totalNum, 0), 4), 0) * 100, 2) rectifiedNumRatio, @@ -707,7 +707,7 @@