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-23 11:35:42 +08:00
parent db6cd0fd86
commit 44b430caf5
12 changed files with 104 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/DangerousEngineeringControlItemMapper.java
View File

@ -23,4 +23,6 @@ public interface DangerousEngineeringControlItemMapper extends BaseMapper<Danger
List<EntityMap> selectClassControlContentList(Map<String, Object> map);
Map<String, Object> selectEngineeringControlItemCount(@Param("engineeringId") String engineeringId);
List<Long> getControlIdsList(Map<String, Object> map);
}

8
src/main/java/com/zhgd/xmgl/modules/dangerous/mapper/xml/DangerousEngineeringControlItemMapper.xml
View File

@ -18,8 +18,12 @@
</select>
<select id="selectEngineeringControlItemCount" resultType="java.util.Map">
SELECT COUNT(1) total_item_num,
IFNULL(SUM((CASE WHEN choose_type=1 THEN 1 ELSE 0 END)),0) yes_num
IFNULL(SUM((CASE WHEN choose_type=1 THEN 1 ELSE 0 END)),0) yes_num
from dangerous_engineering_control_item
WHERE engineering_id=#{engineeringId}
</select>
</mapper>
<select id="getControlIdsList" resultType="java.lang.Long">
select distinct control_id from dangerous_engineering_control_item where engineering_id=#{id}
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/dangerous/service/impl/DangerousEngineeringRecordServiceImpl.java
View File

@ -83,6 +83,8 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
if (data != null) {
List<DangerousEngineeringChooseTypeDescribe> chooseTypeDescribeList = dangerousEngineeringChooseTypeDescribeMapper.getChooseTypeDescribeList(MapUtils.getString(data, "id"));
data.put("choose_type_describe_list", chooseTypeDescribeList);
List<Long> controlIdsList = dangerousEngineeringControlItemMapper.getControlIdsList(map);
data.put("control_item_list", controlIdsList);
}
return data;
}
@ -102,7 +104,6 @@ public class DangerousEngineeringRecordServiceImpl extends ServiceImpl<Dangerous
if (dangerousEngineeringRecord.getTypeDescribeList() != null && dangerousEngineeringRecord.getTypeDescribeList().size() > 0) {
for (DangerousEngineeringChooseTypeDescribe typeDescribe : dangerousEngineeringRecord.getTypeDescribeList()) {
typeDescribe.setEngineeringId(id);
//typeDescribe.setDescribeId(dangerousEngineeringRecord.getTypeDescribeId());
dangerousEngineeringChooseTypeDescribeMapper.insert(typeDescribe);
}
}

33
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressContentController.java
View File

@ -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<IPage<XzTaskProgressContent>> queryPageList(XzTaskProgressContent taskProgressContent,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<XzTaskProgressContent>> result = new Result<IPage<XzTaskProgressContent>>();
QueryWrapper<XzTaskProgressContent> queryWrapper = QueryGenerator.initQueryWrapper(taskProgressContent, req.getParameterMap());
Page<XzTaskProgressContent> page = new Page<XzTaskProgressContent>(pageNo, pageSize);
IPage<XzTaskProgressContent> pageList = taskProgressContentService.page(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
public Result<IPage<XzTaskProgressContent>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> 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<List<XzTaskProgressContent>> queryList(XzTaskProgressContent taskProgressContent,
HttpServletRequest req) {
return Result.success(taskProgressContentService.queryList(taskProgressContent, req));
public Result<List<XzTaskProgressContent>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> 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<XzTaskProgressContent> queryNewestOne(XzTaskProgressContent taskProgressContent,
HttpServletRequest req) {
return Result.success(taskProgressContentService.queryNewestOne(taskProgressContent, req));
public Result<XzTaskProgressContent> queryNewestOne(@RequestParam HashMap<String, Object> paramMap) {
return Result.success(taskProgressContentService.queryNewestOne(paramMap);
}
/**

10
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressContent.java
View File

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

5
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzTaskProgressTotal.java
View File

@ -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;
/**
* 变更前进度%

6
src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzTaskProgressContentMapper.java
View File

@ -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<XzTaskProgressContent> {
List<XzTaskProgressContent> queryList(XzTaskProgressContent taskProgressContent, @Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper);
List<XzTaskProgressContent> queryList(@Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper);
IPage<XzTaskProgressContent> queryList(Page<XzTaskProgressContent> page, @Param(Constants.WRAPPER) QueryWrapper<XzTaskProgressContent> queryWrapper);
}

6
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressContentMapper.xml
View File

@ -2,8 +2,10 @@
<!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.XzTaskProgressContentMapper">
<select id="queryList" resultType="com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent">
select *
from xz_task_progress_content
select c.*,qr.region_name,ei.enterprise_name
from xz_task_progress_content c
join quality_region qr on c.project_sn = qr.project_sn
join enterprise_info ei on ei.id=c.enterprise_id
${ew.customSqlSegment}
</select>
</mapper>

8
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressContentService.java
View File

@ -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<XzTaskProgressCo
void add(XzTaskProgressContent taskProgressContent);
List<XzTaskProgressContent> queryList(XzTaskProgressContent taskProgressContent, HttpServletRequest req);
List<XzTaskProgressContent> queryList(HashMap<String, Object> paramMap);
XzTaskProgressContent queryNewestOne(XzTaskProgressContent taskProgressContent, HttpServletRequest req);
XzTaskProgressContent queryNewestOne(HashMap<String, Object> paramMap);
IPage<XzTaskProgressContent> queryPageList(HashMap<String, Object> paramMap);
}

1
src/main/java/com/zhgd/xmgl/modules/xz/service/IXzTaskProgressTotalService.java
View File

@ -24,4 +24,5 @@ public interface IXzTaskProgressTotalService extends IService<XzTaskProgressTota
void edit(XzTaskProgressTotal xzTaskProgressTotal);
void delete(String id);
}

47
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressContentServiceImpl.java
View File

@ -2,9 +2,10 @@ package com.zhgd.xmgl.modules.xz.service.impl;
import cn.hutool.core.collection.CollUtil;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel;
import com.zhgd.xmgl.modules.xz.entity.XzTaskProgress;
import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent;
import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressContentMapper;
@ -12,15 +13,15 @@ import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressMapper;
import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressContentService;
import com.zhgd.xmgl.security.entity.UserInfo;
import com.zhgd.xmgl.security.util.SecurityUtils;
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 javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @Description: 任务进度甘特图-内容
@ -54,21 +55,35 @@ public class XzTaskProgressContentServiceImpl extends ServiceImpl<XzTaskProgress
}
@Override
public List<XzTaskProgressContent> queryList(XzTaskProgressContent taskProgressContent, HttpServletRequest req) {
QueryWrapper<XzTaskProgressContent> queryWrapper = QueryGenerator.initQueryWrapper(taskProgressContent, req.getParameterMap());
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(XzTaskProgressContent::getCreateDate));
List<XzTaskProgressContent> taskProgressContents = baseMapper.queryList(taskProgressContent, queryWrapper);
List<Long> ids = taskProgressContents.stream().map(XzTaskProgressContent::getId).collect(Collectors.toList());
if (CollUtil.isNotEmpty(ids)) {
for (XzTaskProgressContent progressContent : taskProgressContents) {
}
}
return taskProgressContents;
public XzTaskProgressContent queryNewestOne(HashMap<String, Object> paramMap) {
List<XzTaskProgressContent> taskProgressContents = queryList(paramMap);
return CollUtil.isNotEmpty(taskProgressContents) ? taskProgressContents.get(0) : null;
}
@Override
public XzTaskProgressContent queryNewestOne(XzTaskProgressContent taskProgressContent, HttpServletRequest req) {
List<XzTaskProgressContent> taskProgressContents = queryList(taskProgressContent, req);
return CollUtil.isNotEmpty(taskProgressContents) ? taskProgressContents.get(0) : null;
public IPage<XzTaskProgressContent> queryPageList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTaskProgressContent> queryWrapper = getQueryWrapper(paramMap);
Page<XzTaskProgressContent> page = PageUtil.getPage(paramMap);
IPage<XzTaskProgressContent> pageList = baseMapper.queryList(page, queryWrapper);
pageList.setRecords(dealList(pageList.getRecords()));
return pageList;
}
private QueryWrapper<XzTaskProgressContent> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "c.";
QueryWrapper<XzTaskProgressContent> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressContent.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressContent::getCreateDate));
return queryWrapper;
}
@Override
public List<XzTaskProgressContent> queryList(HashMap<String, Object> paramMap) {
QueryWrapper<XzTaskProgressContent> queryWrapper = getQueryWrapper(paramMap);
return dealList(baseMapper.queryList(queryWrapper));
}
private List<XzTaskProgressContent> dealList(List<XzTaskProgressContent> list) {
return list;
}
}

35
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressTotalServiceImpl.java
View File

@ -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<XzTaskProgressTo
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));
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getCreateDate));
return queryWrapper;
}
@ -59,6 +59,17 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
@Override
public void add(XzTaskProgressTotal xzTaskProgressTotal) {
XzTaskProgressTotal total = xzTaskProgressTotalMapper.selectOne(new LambdaQueryWrapper<XzTaskProgressTotal>()
.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);
}