From b930e2776051436e76eec2ee1edad1c89c76190a Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Mon, 22 Apr 2024 19:22:48 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XzTaskProgressController.java | 1 + .../XzTaskProgressTotalController.java | 128 ++++++++++++++++++ .../xz/entity/XzTaskProgressTotal.java | 74 ++++++++++ .../xz/entity/vo/CountTaskProgressVo.java | 2 +- .../xz/mapper/XzTaskProgressMapper.java | 2 + .../xz/mapper/XzTaskProgressTotalMapper.java | 16 +++ .../xz/mapper/xml/XzTaskProgressMapper.xml | 8 ++ .../mapper/xml/XzTaskProgressTotalMapper.xml | 4 + .../service/IXzTaskProgressTotalService.java | 27 ++++ .../impl/XzTaskProgressServiceImpl.java | 19 ++- .../impl/XzTaskProgressTotalServiceImpl.java | 85 ++++++++++++ .../impl/${entityName}ServiceImpl.javai | 3 +- 12 files changed, 366 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java index 2e6b5f902..8d3a390f1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java @@ -242,6 +242,7 @@ public class XzTaskProgressController { @ApiOperation(value = "甘特图统计", notes = "甘特图统计", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "enterpriseId", value = "企业id", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/countTaskProgress") public Result countTaskProgress(@ApiIgnore @RequestBody HashMap paramMap) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java new file mode 100644 index 000000000..c456743da --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java @@ -0,0 +1,128 @@ +package com.zhgd.xmgl.modules.xz.controller; + +import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiImplicitParams; + +import java.util.HashMap; + +import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressTotalService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 星纵-任务进度总进度 + * @author： pds + * @date： 2024-04-22 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/xzTaskProgressTotal") +@Slf4j +@Api(tags = "星纵-任务进度总进度相关Api") +public class XzTaskProgressTotalController { + @Autowired + private IXzTaskProgressTotalService xzTaskProgressTotalService; + + /** + * 分页列表查询 + * + * @return + */ + @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 paramMap) { + return Result.success(xzTaskProgressTotalService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询星纵-任务进度总进度信息", notes = "列表查询星纵-任务进度总进度信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(xzTaskProgressTotalService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param xzTaskProgressTotal + * @return + */ + @ApiOperation(value = "添加星纵-任务进度总进度信息", notes = "添加星纵-任务进度总进度信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate XzTaskProgressTotal xzTaskProgressTotal) { + xzTaskProgressTotalService.add(xzTaskProgressTotal); + return Result.ok(); + } + + /** + * 编辑 + * + * @param xzTaskProgressTotal + * @return + */ + @ApiOperation(value = "编辑星纵-任务进度总进度信息", notes = "编辑星纵-任务进度总进度信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody XzTaskProgressTotal xzTaskProgressTotal) { + xzTaskProgressTotalService.edit(xzTaskProgressTotal); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @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) { + xzTaskProgressTotalService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @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) { + Result result = new Result(); + XzTaskProgressTotal xzTaskProgressTotal = xzTaskProgressTotalService.getById(id); + if (xzTaskProgressTotal == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(xzTaskProgressTotal); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java new file mode 100644 index 000000000..296ef9d0b --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java @@ -0,0 +1,74 @@ +package com.zhgd.xmgl.modules.xz.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-04-22 + * @version： V1.0 + */ +@Data +@TableName("xz_task_progress_total") +@ApiModel(value = "XzTaskProgressTotal实体类", description = "XzTaskProgressTotal") +public class XzTaskProgressTotal implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 所属项目SN + */ + @Excel(name = "所属项目SN", width = 15) + @ApiModelProperty(value = "所属项目SN") + private java.lang.String projectSn; + /** + * 合作单位id + */ + @Excel(name = "合作单位id", width = 15) + @ApiModelProperty(value = "合作单位id") + private java.lang.Long enterpriseId; + /** + * 变更前进度% + */ + @Excel(name = "变更前进度%", width = 15) + @ApiModelProperty(value = "变更前进度%") + private java.lang.Double changeBefore; + /** + * 变更后进度% + */ + @Excel(name = "变更后进度%", width = 15) + @ApiModelProperty(value = "变更后进度%") + private java.lang.Double changeAfter; + /** + * 创建时间 + */ + @Excel(name = "创建时间", width = 20, format = "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 = "创建时间") + private java.util.Date createDate; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "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 = "更新时间") + private java.util.Date updateDate; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java index 8bd9056a3..6fb1289f8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class CountTaskProgressVo { - @ApiModelProperty("项目总进度") + @ApiModelProperty("项目总进度%") private Double projectTotalProgress; @ApiModelProperty("项目总天数") private Integer projectTotalDayNum; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java index 9cbe5cae9..c6c417ea2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java @@ -35,4 +35,6 @@ public interface XzTaskProgressMapper extends BaseMapper { List countMppStatus(HashMap paramMap); CountTaskProgressVo countTaskProgress(HashMap paramMap); + + CountTaskProgressVo getMaxMinProgress(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java new file mode 100644 index 000000000..fa49b9abd --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.xz.mapper; + +import org.apache.ibatis.annotations.Mapper; +import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 星纵-任务进度总进度 + * @author： pds + * @date： 2024-04-22 + * @version： V1.0 + */ +@Mapper +public interface XzTaskProgressTotalMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml index 95dbdee43..3924da99c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml @@ -151,4 +151,12 @@ and finish_date >= date_add(date_add(curdate(), interval 1 month), interval - day(curdate()) + 1 day)) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml new file mode 100644 index 000000000..1c5d2f4c2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java new file mode 100644 index 000000000..7e2d94a73 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java @@ -0,0 +1,27 @@ +package com.zhgd.xmgl.modules.xz.service; + +import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal; +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-04-22 + * @version： V1.0 + */ +public interface IXzTaskProgressTotalService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(XzTaskProgressTotal xzTaskProgressTotal); + + void edit(XzTaskProgressTotal xzTaskProgressTotal); + + void delete(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java index 27a0c0340..19f6cc6ae 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java @@ -28,10 +28,12 @@ import com.zhgd.xmgl.modules.taskprogress.service.ITaskProgressService; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgress; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressAlarm; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; +import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal; import com.zhgd.xmgl.modules.xz.entity.vo.CountTaskProgressVo; import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressAlarmMapper; import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressContentMapper; import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressMapper; +import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressTotalMapper; import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressService; import com.zhgd.xmgl.security.util.SecurityUtils; import com.zhgd.xmgl.util.PageUtil; @@ -71,6 +73,8 @@ public class XzTaskProgressServiceImpl extends ServiceImpl paramMap) { - return baseMapper.countTaskProgress(paramMap); + String enterpriseId = MapUtils.getString(paramMap, "enterpriseId"); + String projectSn = MapUtils.getString(paramMap, "projectSn"); + XzTaskProgressTotal xzTaskProgressTotal = xzTaskProgressTotalMapper.selectOne(new LambdaQueryWrapper() + .eq(XzTaskProgressTotal::getProjectSn, projectSn) + .eq(XzTaskProgressTotal::getEnterpriseId, enterpriseId) + .orderByDesc(XzTaskProgressTotal::getCreateDate) + .last("limit 1") + ); + CountTaskProgressVo vo = baseMapper.countTaskProgress(paramMap); + if (xzTaskProgressTotal == null) { + vo.setProjectTotalProgress(xzTaskProgressTotal.getChangeAfter()); + } + CountTaskProgressVo vo1 = baseMapper.getMaxMinProgress(paramMap); + return vo; } @Override diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java new file mode 100644 index 000000000..6fc234d07 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java @@ -0,0 +1,85 @@ +package com.zhgd.xmgl.modules.xz.service.impl; + +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressTotal; +import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressTotalMapper; +import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressTotalService; +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 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-04-22 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class XzTaskProgressTotalServiceImpl extends ServiceImpl implements IXzTaskProgressTotalService { + @Autowired + private XzTaskProgressTotalMapper xzTaskProgressTotalMapper; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = this.page(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(this.list(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = ""; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressTotal.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getId)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzTaskProgressTotal xzTaskProgressTotal) { + xzTaskProgressTotal.setId(null); + baseMapper.insert(xzTaskProgressTotal); + } + + @Override + public void edit(XzTaskProgressTotal xzTaskProgressTotal) { + XzTaskProgressTotal xzTaskProgressTotal1 = baseMapper.selectById(xzTaskProgressTotal.getId()); + if (xzTaskProgressTotal1 == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzTaskProgressTotal); + } + + @Override + public void delete(String id) { + XzTaskProgressTotal xzTaskProgressTotal = baseMapper.selectById(id); + if (xzTaskProgressTotal == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + +} diff --git a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai index 0818727ac..b9e2f6b97 100644 --- a/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai +++ b/src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai @@ -62,7 +62,8 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $ @Override public void edit(${entityName} ${entityName?uncap_first}) { - if(baseMapper.selectById(id)==null) { + ${entityName} old${entityName} = baseMapper.selectById(${entityName?uncap_first}.getId()); + if(old${entityName}==null) { throw new OpenAlertException("未找到对应实体"); } baseMapper.updateById(${entityName?uncap_first});