From 16224a5dd22d5e419c1e2097e14ef7e77b612bcf Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 12 May 2022 15:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=8A=B6=E6=80=81=E8=AF=84=E4=BC=B0=E8=A1=A8=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConditionAssessmentEOController.java | 183 ++++++++++++++++++ .../project/entity/ConditionAssessmentEO.java | 83 ++++++++ .../mapper/ConditionAssessmentEOMapper.java | 17 ++ .../xml/ConditionAssessmentEOMapper.xml | 16 ++ .../IConditionAssessmentEOService.java | 78 ++++++++ .../ConditionAssessmentEOServiceImpl.java | 169 ++++++++++++++++ .../ProjectTaskInventoryEOServiceImpl.java | 14 +- 7 files changed, 559 insertions(+), 1 deletion(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ConditionAssessmentEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java new file mode 100644 index 000000000..2d8728df4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java @@ -0,0 +1,183 @@ +package com.jero.modules.project.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.service.IConditionAssessmentEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 任务清单-项目状态评估表 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Api(tags="任务清单-项目状态评估表") +@RestController +@RequestMapping("/project/projectTaskInventoryConditionAssessmentEO") +@Slf4j +public class ConditionAssessmentEOController extends JeroController { + @Autowired + private IConditionAssessmentEOService conditionAssessmentEOService; + + /** + * 分页列表查询 + * + * @param projectTaskInventoryConditionAssessmentEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-分页列表查询") + @ApiOperation(value="任务清单-项目状态评估表-分页列表查询", notes="任务清单-项目状态评估表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ConditionAssessmentEO projectTaskInventoryConditionAssessmentEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectTaskInventoryConditionAssessmentEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = conditionAssessmentEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-列表查询") + @ApiOperation(value="任务清单-项目状态评估表-列表查询", notes="任务清单-项目状态评估表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = conditionAssessmentEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param conditionAssessmentEO + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-添加") + @ApiOperation(value="任务清单-项目状态评估表-添加", notes="任务清单-项目状态评估表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ConditionAssessmentEO conditionAssessmentEO) { + conditionAssessmentEOService.add(conditionAssessmentEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param conditionAssessmentEO + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-编辑") + @ApiOperation(value="任务清单-项目状态评估表-编辑", notes="任务清单-项目状态评估表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ConditionAssessmentEO conditionAssessmentEO) { + conditionAssessmentEOService.editById(conditionAssessmentEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-通过id删除") + @ApiOperation(value="任务清单-项目状态评估表-通过id删除", notes="任务清单-项目状态评估表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + conditionAssessmentEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-批量删除") + @ApiOperation(value="任务清单-项目状态评估表-批量删除", notes="任务清单-项目状态评估表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.conditionAssessmentEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-通过id查询") + @ApiOperation(value="任务清单-项目状态评估表-通过id查询", notes="任务清单-项目状态评估表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ConditionAssessmentEO projectTaskInventoryConditionAssessmentEO = conditionAssessmentEOService.queryById(id); + if(projectTaskInventoryConditionAssessmentEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectTaskInventoryConditionAssessmentEO); + } + + /** + * 导出excel + * + * @param request + * @param conditionAssessmentEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ConditionAssessmentEO conditionAssessmentEO) { + return super.exportXls(request, conditionAssessmentEO, ConditionAssessmentEO.class, "任务清单-项目状态评估表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ConditionAssessmentEO.class); + } + + /** + * 添加或修改 + * + * @param conditionAssessmentEO + * @return + */ + @AutoLog(value = "任务清单-项目状态评估表-添加或修改") + @ApiOperation(value="任务清单-项目状态评估表-添加或修改", notes="任务清单-项目状态评估表-添加或修改") + @PostMapping(value = "/addOrUpdate") + public Result addOrUpdate(@Validated @RequestBody ConditionAssessmentEO conditionAssessmentEO) { + return conditionAssessmentEOService.addOrUpdate(conditionAssessmentEO); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ConditionAssessmentEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ConditionAssessmentEO.java new file mode 100644 index 000000000..beeaa246c --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ConditionAssessmentEO.java @@ -0,0 +1,83 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +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; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + + +/** + * @Description: 任务清单-项目状态评估表 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Data +@TableName("project_task_inventory_condition_assessment") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_task_inventory_condition_assessment对象", description="任务清单-项目状态评估表") +public class ConditionAssessmentEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @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 createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @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 updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**评估状态*/ + @Excel(name = "评估状态", width = 15) + @ApiModelProperty(value = "评估状态") + private String conditionAssessment; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remark; + + /**法规清单id*/ + @Excel(name = "法规清单id", width = 15) + @ApiModelProperty(value = "法规清单id") + private String projectLawsInventoryId; + + /**角色编码 1:法规工程师 、2:认证工程师*/ + @Excel(name = "角色编码 1:法规工程师 、2:认证工程师", width = 15) + @ApiModelProperty(value = "角色编码 1:法规工程师 、2:认证工程师") + private String roleCode; + + @TableField(exist = false) + private String cut; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java new file mode 100644 index 000000000..ec58479e2 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ConditionAssessmentEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import com.jero.modules.project.entity.ConditionAssessmentEO; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 任务清单-项目状态评估表 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface ConditionAssessmentEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml new file mode 100644 index 000000000..dfe111a08 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ConditionAssessmentEOMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java new file mode 100644 index 000000000..c693ba659 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java @@ -0,0 +1,78 @@ +package com.jero.modules.project.service; + +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.entity. ConditionAssessmentEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 任务清单-项目状态评估表 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +public interface IConditionAssessmentEOService extends IService { + + /** + * 保存 + * + * @param ConditionAssessmentEO + * @return + */ + void add(ConditionAssessmentEO ConditionAssessmentEO); + + /** + * 更新 + * + * @param ConditionAssessmentEO + * @return + */ + void editById(ConditionAssessmentEO ConditionAssessmentEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ConditionAssessmentEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List< ConditionAssessmentEO> queryList(); + + /** + * 任务清单-项目状态评估表-添加或修改 + * @param ConditionAssessmentEO + */ + Result addOrUpdate(ConditionAssessmentEO ConditionAssessmentEO); + + /** + * 获取项目状态评估 + * @param projectLawsInventoryId + * @param roleCode + * @return + */ + ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode, LoginUser currentUser); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java new file mode 100644 index 000000000..ba7ef0d3f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -0,0 +1,169 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ConditionAssessmentEO; +import com.jero.modules.project.enums.ProjectRoleEnum; +import com.jero.modules.project.mapper.ConditionAssessmentEOMapper; +import com.jero.modules.project.service.IConditionAssessmentEOService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import java.util.*; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 任务清单-项目状态评估表 + * @Author: jero-boot + * @Date: 2022-05-12 + * @Version: V1.0 + */ +@Service +public class ConditionAssessmentEOServiceImpl extends ServiceImpl implements IConditionAssessmentEOService { + + /** + * 保存 + * + * @param conditionAssessmentEO + * @return + */ + @Override + public void add(ConditionAssessmentEO conditionAssessmentEO) { + Date now = new Date(); + conditionAssessmentEO.setCreateTime(now); + conditionAssessmentEO.setUpdateTime(now); + save(conditionAssessmentEO); + } + + /** + * 更新 + * + * @param conditionAssessmentEO + * @return + */ + @Override + public void editById(ConditionAssessmentEO conditionAssessmentEO) { + Date now = new Date(); + conditionAssessmentEO.setUpdateTime(now); + saveOrUpdate(conditionAssessmentEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public ConditionAssessmentEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } + + @Override + public Result addOrUpdate(ConditionAssessmentEO conditionAssessmentEO) { + List roleCodeList = new ArrayList<>(); + List list = new ArrayList<>(); + + if(StringUtils.equals(conditionAssessmentEO.getRoleCode(), ProjectRoleEnum.REGULATI_ENGINEER.getValue())){ + roleCodeList.add(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + list.add(conditionAssessmentEO); + }else if(StringUtils.equals(conditionAssessmentEO.getRoleCode(), ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ + roleCodeList.add(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + list.add(conditionAssessmentEO); + }else if(StringUtils.equals(conditionAssessmentEO.getRoleCode(), ProjectRoleEnum.REGULATI_AND_HOMOLOGATION_ENGINEER.getValue())){ + roleCodeList.add(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + roleCodeList.add(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + + ConditionAssessmentEO regulatiEngineer = new ConditionAssessmentEO(); + regulatiEngineer.setRoleCode(ProjectRoleEnum.REGULATI_ENGINEER.getValue()); + BeanUtils.copyProperties(conditionAssessmentEO, regulatiEngineer); + + ConditionAssessmentEO homologationEngineer = new ConditionAssessmentEO(); + homologationEngineer.setRoleCode(ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue()); + BeanUtils.copyProperties(conditionAssessmentEO, homologationEngineer); + + list.add(regulatiEngineer); + list.add(homologationEngineer); + } + if(CollectionUtils.isNotEmpty(list)){ + QueryWrapper deleteWrapper = new QueryWrapper<>(); + deleteWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,conditionAssessmentEO.getProjectLawsInventoryId()); + deleteWrapper.lambda().in(ConditionAssessmentEO::getRoleCode,roleCodeList); + this.baseMapper.delete(deleteWrapper); + + saveBatch(list); + } + return Result.ok(); + } + + /** + * 获取项目状态评估 + * @param projectLawsInventoryId + * @param roleCode + * @return + */ + @Override + public ConditionAssessmentEO getProjectStatusAssess(String projectLawsInventoryId, String roleCode,LoginUser currentUser) { + ConditionAssessmentEO result = null; + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); + + if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ + queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername()); + } + + List projectTaskInventoryConditionAssessmentEOList = this.baseMapper.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(projectTaskInventoryConditionAssessmentEOList)){ + + if(projectTaskInventoryConditionAssessmentEOList.size()>1){ + // 匿名比较器排序 + Collections.sort(projectTaskInventoryConditionAssessmentEOList, new Comparator() { + @Override + public int compare(ConditionAssessmentEO p1, ConditionAssessmentEO p2) { + return p1.getConditionAssessment().compareTo(p2.getConditionAssessment()); + } + }); + } + + result = projectTaskInventoryConditionAssessmentEOList.get(0); + } + return result; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 622bf3504..8ea2b753c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -10,6 +10,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.*; import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.*; +import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectTaskInventoryEOService; import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.system.entity.SysUser; @@ -52,6 +53,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl