diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringControlItemMapper.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringControlItemMapper.java index a0ed204f2..e30895f56 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringControlItemMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringControlItemMapper.java @@ -23,4 +23,6 @@ public interface DangerousEngineeringControlItemMapper extends BaseMapper selectClassControlContentList(Map map); Map selectEngineeringControlItemCount(@Param("engineeringId") String engineeringId); + + List getControlIdsList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringControlItemMapper.xml b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringControlItemMapper.xml index 915142392..a640ae276 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringControlItemMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringControlItemMapper.xml @@ -18,8 +18,12 @@ - \ No newline at end of file + + + 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 6393a2efe..e18befef3 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 @@ -83,6 +83,8 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl chooseTypeDescribeList = dangerousEngineeringChooseTypeDescribeMapper.getChooseTypeDescribeList(MapUtils.getString(data, "id")); data.put("choose_type_describe_list", chooseTypeDescribeList); + List controlIdsList = dangerousEngineeringControlItemMapper.getControlIdsList(map); + data.put("control_item_list", controlIdsList); } return data; } @@ -102,7 +104,6 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl 0) { for (DangerousEngineeringChooseTypeDescribe typeDescribe : dangerousEngineeringRecord.getTypeDescribeList()) { typeDescribe.setEngineeringId(id); - //typeDescribe.setDescribeId(dangerousEngineeringRecord.getTypeDescribeId()); dangerousEngineeringChooseTypeDescribeMapper.insert(typeDescribe); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java index 2b639e6c6..ad3837708 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java @@ -49,32 +49,21 @@ public class XzTaskProgressContentController { /** * 分页列表查询 * - * @param taskProgressContent - * @param pageNo - * @param pageSize - * @param req * @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(XzTaskProgressContent taskProgressContent, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressContent, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = taskProgressContentService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(taskProgressContentService.queryPageList(paramMap)); } /** * 列表查询 * - * @param taskProgressContent - * @param req * @return */ @ApiOperation(value = "列表查询任务进度甘特图-内容信息", notes = "列表查询任务进度甘特图-内容信息", httpMethod = "GET") @@ -82,9 +71,8 @@ public class XzTaskProgressContentController { @ApiImplicitParam(name = "taskProgressId", value = "任务进度甘特图id", paramType = "query", required = true, dataType = "String"), }) @GetMapping(value = "/list") - public Result> queryList(XzTaskProgressContent taskProgressContent, - HttpServletRequest req) { - return Result.success(taskProgressContentService.queryList(taskProgressContent, req)); + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(taskProgressContentService.queryList(paramMap)); } @ApiOperation(value = "查询最新任务进度甘特图-内容信息", notes = "查询最新任务进度甘特图-内容信息", httpMethod = "GET") @@ -92,9 +80,8 @@ public class XzTaskProgressContentController { @ApiImplicitParam(name = "taskProgressId", value = "任务进度甘特图id", paramType = "query", required = true, dataType = "String"), }) @GetMapping(value = "/queryNewestOne") - public Result queryNewestOne(XzTaskProgressContent taskProgressContent, - HttpServletRequest req) { - return Result.success(taskProgressContentService.queryNewestOne(taskProgressContent, req)); + public Result queryNewestOne(@RequestParam HashMap paramMap) { + return Result.success(taskProgressContentService.queryNewestOne(paramMap); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressContent.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressContent.java index cbb3043d3..4819662ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressContent.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressContent.java @@ -12,7 +12,6 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.List; /** * @Description: 任务进度甘特图-内容 @@ -123,6 +122,15 @@ public class XzTaskProgressContent implements Serializable { @ApiModelProperty(value = "驳回原因") private java.lang.String rejectReason; + @TableField(exist = false) + @ApiModelProperty(value = "任务名称") + private String taskName; + @TableField(exist = false) + @ApiModelProperty(value = "区域名称") + private String regionName; + @TableField(exist = false) + @ApiModelProperty(value = "单位名称") + private String enterpriseName; } 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 index 296ef9d0b..2761676e6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java @@ -13,6 +13,9 @@ import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** * @Description: 星纵-任务进度总进度 * @author： pds @@ -36,12 +39,14 @@ public class XzTaskProgressTotal implements Serializable { */ @Excel(name = "所属项目SN", width = 15) @ApiModelProperty(value = "所属项目SN") + @NotBlank private java.lang.String projectSn; /** * 合作单位id */ @Excel(name = "合作单位id", width = 15) @ApiModelProperty(value = "合作单位id") + @NotNull private java.lang.Long enterpriseId; /** * 变更前进度% diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java index 561b61a34..c1e7672f4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java @@ -2,7 +2,9 @@ package com.zhgd.xmgl.modules.xz.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -18,5 +20,7 @@ import java.util.List; @Mapper public interface XzTaskProgressContentMapper extends BaseMapper { - List queryList(XzTaskProgressContent taskProgressContent, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml index e8a85135d..75d2ba0cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml @@ -2,8 +2,10 @@ diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java index 5dac29b93..540171ace 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java @@ -1,9 +1,11 @@ package com.zhgd.xmgl.modules.xz.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent; import com.baomidou.mybatisplus.extension.service.IService; import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.List; /** @@ -16,7 +18,9 @@ public interface IXzTaskProgressContentService extends IService queryList(XzTaskProgressContent taskProgressContent, HttpServletRequest req); + List queryList(HashMap paramMap); - XzTaskProgressContent queryNewestOne(XzTaskProgressContent taskProgressContent, HttpServletRequest req); + XzTaskProgressContent queryNewestOne(HashMap paramMap); + + IPage queryPageList(HashMap paramMap); } 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 index 7e2d94a73..cea9b7523 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java @@ -24,4 +24,5 @@ public interface IXzTaskProgressTotalService extends IService queryList(XzTaskProgressContent taskProgressContent, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(taskProgressContent, req.getParameterMap()); - queryWrapper.orderByDesc(RefUtil.fieldNameUlc(XzTaskProgressContent::getCreateDate)); - List taskProgressContents = baseMapper.queryList(taskProgressContent, queryWrapper); - List ids = taskProgressContents.stream().map(XzTaskProgressContent::getId).collect(Collectors.toList()); - if (CollUtil.isNotEmpty(ids)) { - for (XzTaskProgressContent progressContent : taskProgressContents) { - } - } - return taskProgressContents; + public XzTaskProgressContent queryNewestOne(HashMap paramMap) { + List taskProgressContents = queryList(paramMap); + return CollUtil.isNotEmpty(taskProgressContents) ? taskProgressContents.get(0) : null; } @Override - public XzTaskProgressContent queryNewestOne(XzTaskProgressContent taskProgressContent, HttpServletRequest req) { - List taskProgressContents = queryList(taskProgressContent, req); - return CollUtil.isNotEmpty(taskProgressContents) ? taskProgressContents.get(0) : null; + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = baseMapper.queryList(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = "c."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressContent.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressContent::getCreateDate)); + return queryWrapper; + } + + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(baseMapper.queryList(queryWrapper)); + } + + private List dealList(List list) { + return list; } } 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 index 6fc234d07..72e5f6ed7 100644 --- 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 @@ -1,24 +1,24 @@ 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.LambdaQueryWrapper; 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.xz.entity.XzTaskProgressTotal; +import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressTotalMapper; +import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressTotalService; +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 org.springframework.transaction.annotation.Transactional; 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 @@ -49,7 +49,7 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = ""; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressTotal.class, paramMap, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getId)); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getCreateDate)); return queryWrapper; } @@ -59,6 +59,17 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl() + .eq(XzTaskProgressTotal::getProjectSn, xzTaskProgressTotal.getProjectSn()) + .eq(XzTaskProgressTotal::getEnterpriseId, xzTaskProgressTotal.getEnterpriseId()) + .orderByDesc(XzTaskProgressTotal::getCreateDate) + .last("limit 1") + ); + if (total != null) { + xzTaskProgressTotal.setChangeBefore(total.getChangeAfter()); + } else { + xzTaskProgressTotal.setChangeBefore(0D); + } xzTaskProgressTotal.setId(null); baseMapper.insert(xzTaskProgressTotal); }