admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-04-22 19:22:48 +08:00
parent 5e043eb365
commit b930e27760
12 changed files with 366 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java
View File

@ -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<CountTaskProgressVo> countTaskProgress(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {

128
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressTotalController.java Normal file
View File

@ -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<IPage<XzTaskProgressTotal>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzTaskProgressTotalService.queryPageList(paramMap));
}
/**
* 列表查询
*
* @return
*/
@ApiOperation(value = "列表查询星纵-任务进度总进度信息", notes = "列表查询星纵-任务进度总进度信息", httpMethod = "GET")
@GetMapping(value = "/list")
public Result<List<XzTaskProgressTotal>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
return Result.success(xzTaskProgressTotalService.queryList(paramMap));
}
/**
* 添加
*
* @param xzTaskProgressTotal
* @return
*/
@ApiOperation(value = "添加星纵-任务进度总进度信息", notes = "添加星纵-任务进度总进度信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<XzTaskProgressTotal> add(@RequestBody @Validate XzTaskProgressTotal xzTaskProgressTotal) {
xzTaskProgressTotalService.add(xzTaskProgressTotal);
return Result.ok();
}
/**
* 编辑
*
* @param xzTaskProgressTotal
* @return
*/
@ApiOperation(value = "编辑星纵-任务进度总进度信息", notes = "编辑星纵-任务进度总进度信息", httpMethod = "POST")
@PostMapping(value = "/edit")
public Result<XzTaskProgressTotal> 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<XzTaskProgressTotal> delete(@ApiIgnore @RequestBody HashMap<String, Object> 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<XzTaskProgressTotal> queryById(@RequestParam(name = "id", required = true) String id) {
Result<XzTaskProgressTotal> result = new Result<XzTaskProgressTotal>();
XzTaskProgressTotal xzTaskProgressTotal = xzTaskProgressTotalService.getById(id);
if (xzTaskProgressTotal == null) {
result.error500("未找到对应实体");
} else {
result.setResult(xzTaskProgressTotal);
result.setSuccess(true);
}
return result;
}
}

74
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java Normal file
View File

@ -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;
}

2
src/main/java/com/zhgd/xmgl/modules/xz/entity/vo/CountTaskProgressVo.java
View File

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class CountTaskProgressVo {
@ApiModelProperty("项目总进度")
@ApiModelProperty("项目总进度%")
private Double projectTotalProgress;
@ApiModelProperty("项目总天数")
private Integer projectTotalDayNum;

2
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressMapper.java
View File

@ -35,4 +35,6 @@ public interface XzTaskProgressMapper extends BaseMapper<XzTaskProgress> {
List<SectorOneVo> countMppStatus(HashMap<String, Object> paramMap);
CountTaskProgressVo countTaskProgress(HashMap<String, Object> paramMap);
CountTaskProgressVo getMaxMinProgress(HashMap<String, Object> paramMap);
}

16
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressTotalMapper.java Normal file
View File

@ -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<XzTaskProgressTotal> {
}

8
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
View File

@ -151,4 +151,12 @@
and finish_date >= date_add(date_add(curdate(), interval 1 month), interval - day(curdate()) + 1 day))
</if>
</select>
<select id="getMaxMinProgress" resultType="com.zhgd.xmgl.modules.xz.entity.vo.CountTaskProgressVo">
select *
from xz_task_progress p
join quality_region qr on qr.id = p.quality_region_id
join project_enterprise pe on pe.enterprise_id = p.enterprise_id
where 1 = 1
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressTotalMapper.xml Normal file
View File

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

27
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java Normal file
View File

@ -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<XzTaskProgressTotal> {
IPage<XzTaskProgressTotal> queryPageList(HashMap<String, Object> paramMap);
List<XzTaskProgressTotal> queryList(HashMap<String, Object> paramMap);
void add(XzTaskProgressTotal xzTaskProgressTotal);
void edit(XzTaskProgressTotal xzTaskProgressTotal);
void delete(String id);
}

19
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
View File

@ -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<XzTaskProgressMapper,
@Value("${basePath}")
private String basePath;
@Autowired
XzTaskProgressTotalMapper xzTaskProgressTotalMapper;
@Autowired
XzTaskProgressContentMapper taskProgressContentMapper;
@Autowired
XzTaskProgressAlarmMapper taskProgressAlarmMapper;
@ -483,7 +487,20 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
@Override
public CountTaskProgressVo countTaskProgress(HashMap<String, Object> paramMap) {
return baseMapper.countTaskProgress(paramMap);
String enterpriseId = MapUtils.getString(paramMap, "enterpriseId");
String projectSn = MapUtils.getString(paramMap, "projectSn");
XzTaskProgressTotal xzTaskProgressTotal = xzTaskProgressTotalMapper.selectOne(new LambdaQueryWrapper<XzTaskProgressTotal>()
.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

85
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java Normal file
View File

@ -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<XzTaskProgressTotalMapper, XzTaskProgressTotal> implements IXzTaskProgressTotalService {
@Autowired
private XzTaskProgressTotalMapper xzTaskProgressTotalMapper;
@Override
public IPage<XzTaskProgressTotal> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTaskProgressTotal> queryWrapper = getQueryWrapper(paramMap);
Page<XzTaskProgressTotal> page = PageUtil.getPage(paramMap);
IPage<XzTaskProgressTotal> pageList = this.page(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
@Override
public List<XzTaskProgressTotal> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTaskProgressTotal> queryWrapper = getQueryWrapper(paramMap);
return dealList(this.list(queryWrapper));
}
private QueryWrapper<XzTaskProgressTotal> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "";
QueryWrapper<XzTaskProgressTotal> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressTotal.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getId));
return queryWrapper;
}
private List<XzTaskProgressTotal> dealList(List<XzTaskProgressTotal> 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);
}
}

3
src/main/resources/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
View File

@ -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});