From b6a5b9eece7f722b84d2c3be70c61c545b5f1b58 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 14:21:50 +0800 Subject: [PATCH 01/39] =?UTF-8?q?rxswin=E5=9F=BA=E7=A1=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 179 ++++++++++++++++++ .../project/entity/ProjectRxswinEO.java | 91 +++++++++ .../project/mapper/ProjectRxswinEOMapper.java | 17 ++ .../mapper/xml/ProjectRxswinEOMapper.xml | 18 ++ .../service/IProjectRxswinEOService.java | 62 ++++++ .../impl/ProjectRxswinEOServiceImpl.java | 103 ++++++++++ 6 files changed, 470 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java new file mode 100644 index 000000000..5d627f773 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -0,0 +1,179 @@ +package com.jero.modules.project.controller; + +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.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectRxswinEO; +import com.jero.modules.project.service.IProjectRxswinEOService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + + + /** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +@Api(tags="rxswin表") +@RestController +@RequestMapping("/project/projectRxswinEO") +@Slf4j +public class ProjectRxswinEOController extends JeroController { + @Autowired + private IProjectRxswinEOService projectRxswinEOService; + + /** + * 分页列表查询 + * + * @param projectRxswinEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "rxswin表-分页列表查询") + @ApiOperation(value="rxswin表-分页列表查询", notes="rxswin表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectRxswinEO projectRxswinEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectRxswinEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "rxswin表-列表查询") + @ApiOperation(value="rxswin表-列表查询", notes="rxswin表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectRxswinEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectRxswinEO + * @return + */ + @AutoLog(value = "rxswin表-添加") + @ApiOperation(value="rxswin表-添加", notes="rxswin表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectRxswinEO projectRxswinEO) { + projectRxswinEOService.add(projectRxswinEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectRxswinEO + * @return + */ + @AutoLog(value = "rxswin表-编辑") + @ApiOperation(value="rxswin表-编辑", notes="rxswin表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectRxswinEO projectRxswinEO) { + projectRxswinEOService.editById(projectRxswinEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "rxswin表-通过id删除") + @ApiOperation(value="rxswin表-通过id删除", notes="rxswin表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectRxswinEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "rxswin表-批量删除") + @ApiOperation(value="rxswin表-批量删除", notes="rxswin表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectRxswinEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "rxswin表-通过id查询") + @ApiOperation(value="rxswin表-通过id查询", notes="rxswin表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectRxswinEO projectRxswinEO = projectRxswinEOService.queryById(id); + if(projectRxswinEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectRxswinEO); + } + + /** + * 导出excel + * + * @param request + * @param projectRxswinEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO) { + return super.exportXls(request, projectRxswinEO, ProjectRxswinEO.class, "rxswin表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectRxswinEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java new file mode 100644 index 000000000..c497cf610 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -0,0 +1,91 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +@Data +@TableName("project_rxswin") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_rxswin对象", description="rxswin表") +public class ProjectRxswinEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.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 java.lang.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 java.lang.String sysOrgCode; + + /**项目id*/ + @Excel(name = "项目id", width = 15) + @ApiModelProperty(value = "项目id") + private java.lang.String projectId; + + /**文档库id（编号）*/ + @Excel(name = "文档库id（编号）", width = 15) + @ApiModelProperty(value = "文档库id（编号）") + private java.lang.String documentId; + + /**主题*/ + @Excel(name = "主题", width = 15) + @ApiModelProperty(value = "主题") + private java.lang.String theme; + + /**RXSWIN*/ + @Excel(name = "RXSWIN", width = 15) + @ApiModelProperty(value = "RXSWIN") + private java.lang.String rxswin; + + /**版本*/ + @Excel(name = "版本", width = 15) + @ApiModelProperty(value = "版本") + private java.lang.String version; + + /**状态（0->保存，1->提交）*/ + @Excel(name = "状态（0->保存，1->提交）", width = 15) + @ApiModelProperty(value = "状态（0->保存，1->提交）") + private java.lang.String state; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java new file mode 100644 index 000000000..87cc90096 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.project.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.project.entity.ProjectRxswinEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +public interface ProjectRxswinEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml new file mode 100644 index 000000000..7cdea0ace --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java new file mode 100644 index 000000000..bed6f0e50 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -0,0 +1,62 @@ +package com.jero.modules.project.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.entity.ProjectRxswinEO; + +import java.util.List; + +/** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +public interface IProjectRxswinEOService extends IService { + + /** + * 保存 + * + * @param projectRxswinEO + * @return + */ + void add(ProjectRxswinEO projectRxswinEO); + + /** + * 更新 + * + * @param projectRxswinEO + * @return + */ + void editById(ProjectRxswinEO projectRxswinEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectRxswinEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java new file mode 100644 index 000000000..99cf0a84f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -0,0 +1,103 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectRxswinEO; +import com.jero.modules.project.mapper.ProjectRxswinEOMapper; +import com.jero.modules.project.service.IProjectRxswinEOService; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +@Service +public class ProjectRxswinEOServiceImpl extends ServiceImpl implements IProjectRxswinEOService { + + /** + * 保存 + * + * @param projectRxswinEO + * @return + */ + @Override + public void add(ProjectRxswinEO projectRxswinEO) { + //判断主题是否已存在 + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername()); + wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); + List rxswinEOList = this.list(wrapper); + if(!rxswinEOList.isEmpty()){ + throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加"); + } + Date now = new Date(); + projectRxswinEO.setCreateTime(now); + projectRxswinEO.setUpdateTime(now); + save(projectRxswinEO); + } + + /** + * 更新 + * + * @param projectRxswinEO + * @return + */ + @Override + public void editById(ProjectRxswinEO projectRxswinEO) { + Date now = new Date(); + projectRxswinEO.setUpdateTime(now); + saveOrUpdate(projectRxswinEO); + } + + /** + * 通过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 ProjectRxswinEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} From b82b96c0a280ab4d337564287c87430ad817113b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 14:26:22 +0800 Subject: [PATCH 02/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91--=E9=AA=8C=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectRxswinEOServiceImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 99cf0a84f..0fc6dca34 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -31,10 +31,11 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername()); wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); + wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); List rxswinEOList = this.list(wrapper); if(!rxswinEOList.isEmpty()){ throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加"); @@ -53,6 +54,17 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper =new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername()); + wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); + wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); + wrapper.ne(ProjectRxswinEO::getId,projectRxswinEO.getId()); + List rxswinEOList = this.list(wrapper); + if(!rxswinEOList.isEmpty()){ + throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加"); + } Date now = new Date(); projectRxswinEO.setUpdateTime(now); saveOrUpdate(projectRxswinEO); From a47535323027e7d04eeb2f4223494e8105a0185e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 28 Aug 2023 15:11:01 +0800 Subject: [PATCH 03/39] =?UTF-8?q?RXSWIN=E9=A1=B5=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/ProjectDetails.vue | 33 +- .../components/rxswinModel.vue | 674 ++++++++++++++++++ .../components/transferListRxswin.vue | 232 ++++++ .../components/transferListvirtalRxswin.vue | 348 +++++++++ 6 files changed, 1286 insertions(+), 5 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/rxswinModel.vue create mode 100644 jero-web/src/views/projectManagement/components/transferListRxswin.vue create mode 100644 jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index f46b83a73..e5cf99ed6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1955,4 +1955,6 @@ module.exports = { Reasonforreturn:'Reason for return', maintenanceTemplate:'Maintenance template', UserFeedback:'User Feedback', + Correspondingversion:'Corresponding version', + Listcreationtime:'List creation time', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 0292fa24a..368809127 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3911,4 +3911,6 @@ module.exports = { Modifyremarks:'修改备注', Reasonforreturn:'退回原因', UserFeedback:'用户反馈', + Correspondingversion:'对应版本', + Listcreationtime:'清单创建时间', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 060322c38..bf8446f3f 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -69,13 +69,23 @@ {{queryForm.vehiclePlatform}} +
+ RXSWIN + + + RXSWIN{{$t('detailedList')}} + + +
+ +
{{$t('softwareVersion')}} {{queryForm.softwareVersion}}
-
-
{{$t('dehicleDevelopmentPlan')}} {{queryForm.attestationPlan}}
+ + + + + + + +
+
{{$t('configurationInformation')}} {{queryForm.ipdInfo}}
-
-
-
+
{{$t('explain')}} {{queryForm.explanation}} @@ -153,6 +170,7 @@ @projectStatusForm="projectStatusForm"/> +
@@ -161,6 +179,7 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/transferListRxswin.vue b/jero-web/src/views/projectManagement/components/transferListRxswin.vue new file mode 100644 index 000000000..d19b84601 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/transferListRxswin.vue @@ -0,0 +1,232 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue new file mode 100644 index 000000000..b60182499 --- /dev/null +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -0,0 +1,348 @@ + + + + + \ No newline at end of file From 65101dc89be338019376e02ffb1f1f9b9a5b55d8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 28 Aug 2023 15:34:23 +0800 Subject: [PATCH 04/39] =?UTF-8?q?RXSWIN=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rxswinModel.vue | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 8f8a3c125..383320977 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -75,32 +75,37 @@
-
+ +
{{$t('newlyAdded')}}
-
+ +
{{$t('templateDownload')}}
-
+ +
{{$t('export')}}
+
- +
+
+ v-has="'rxswin:batchdelete'"> {{$t('BatchDelete')}}
{{$t('Transfer')}} @@ -121,10 +126,10 @@ :loading="loading" > - + {{$t('edit')}} - + {{$t('delete')}} From e0221d7698452d96302bfda44ee4ef6c023ac11e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 16:15:21 +0800 Subject: [PATCH 05/39] =?UTF-8?q?=E8=B0=83=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 42 ++++++++++++++ .../project/entity/ProjectLibraryBase.java | 7 +++ .../project/entity/ProjectRxswinEO.java | 5 ++ .../modules/project/enums/StatusEnum.java | 45 ++++++++++++++ .../project/mapper/ProjectRxswinEOMapper.java | 3 + .../mapper/xml/ProjectRxswinEOMapper.xml | 24 +++++++- .../service/IProjectRxswinEOService.java | 19 ++++++ .../impl/ProjectRxswinEOServiceImpl.java | 58 +++++++++++++++++-- 8 files changed, 196 insertions(+), 7 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 5d627f773..20611b4f8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.service.IProjectRxswinEOService; import io.swagger.annotations.Api; @@ -176,4 +177,45 @@ public class ProjectRxswinEOController extends JeroController getOnePage(ProjectRxswinEO projectRxswinEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + + IPage pageList = projectRxswinEOService.getOnePage(pageNo,pageSize,projectRxswinEO); + return Result.OK(pageList); + } + /** + * 调取--第二层 + * + * @param projectRxswinEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "调取--第二层") + @ApiOperation(value="调取--第二层", notes="调取--第二层") + @GetMapping(value = "/getTwoPage") + public Result getTwoPage(ProjectRxswinEO projectRxswinEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + Page page = new Page(pageNo, pageSize); + IPage pageList = projectRxswinEOService.getTwoPage(page,projectRxswinEO); + return Result.OK(pageList); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 6f4a91a15..2fdadb87a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -112,6 +112,13 @@ public class ProjectLibraryBase implements Comparable { @TableField(exist = false) private java.lang.String targetMarketName; + @TableField(exist = false) + private java.lang.String targetMarketNameCn; + + @TableField(exist = false) + private java.lang.String targetMarketNameEn; + + //主项目id parent_id private String parentId; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index c497cf610..064d5804c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -1,6 +1,7 @@ package com.jero.modules.project.entity; 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 com.fasterxml.jackson.annotation.JsonFormat; @@ -88,4 +89,8 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "状态（0->保存，1->提交）") private java.lang.String state; + @TableField(exist = false) + @ApiModelProperty(value = "中英文切换") + private String cut; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java new file mode 100644 index 000000000..05c34bbd5 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java @@ -0,0 +1,45 @@ +package com.jero.modules.project.enums; + +/** + * 任务状态枚举类 + */ +public enum StatusEnum { + SAVE("保存","0"), + SUBMIT("提交","1"), + ; + + + String name; + String value; + + private StatusEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value) { + StatusEnum[] values = values(); + for (StatusEnum taskStatusEnum : values) { + if (taskStatusEnum.value.equals(value)) { + return taskStatusEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java index 87cc90096..d63e2dfe9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java @@ -2,6 +2,7 @@ package com.jero.modules.project.mapper; import java.util.List; +import com.jero.modules.project.entity.ProjectLibraryBase; import org.apache.ibatis.annotations.Param; import com.jero.modules.project.entity.ProjectRxswinEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectRxswinEOMapper extends BaseMapper { + List queryProjectLibraryBaseList(@Param("projectLibraryId") String projectLibraryId); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml index 7cdea0ace..1f2a844c6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml @@ -15,4 +15,26 @@ - \ No newline at end of file + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index bed6f0e50..faa98032a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -1,6 +1,8 @@ package com.jero.modules.project.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import java.util.List; @@ -59,4 +61,21 @@ public interface IProjectRxswinEOService extends IService { * @return */ List queryList(); + + /** + * 调取--第一层 + * @param pageNo + * @param pageSize + * @param projectRxswinEO + * @return + */ + Page getOnePage(Integer pageNo,Integer pageSize, ProjectRxswinEO projectRxswinEO); + + /** + * 调取--第二层 + * @param page + * @param projectRxswinEO + * @return + */ + Page getTwoPage(Page page,ProjectRxswinEO projectRxswinEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 0fc6dca34..e65ab32f5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -1,15 +1,20 @@ package com.jero.modules.project.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; -import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PageUtil; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; +import com.jero.modules.project.enums.StatusEnum; import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; -import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -22,6 +27,8 @@ import java.util.List; @Service public class ProjectRxswinEOServiceImpl extends ServiceImpl implements IProjectRxswinEOService { + @Autowired + private ProjectRxswinEOMapper projectRxswinEOMapper; /** * 保存 * @@ -31,9 +38,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername()); wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); List rxswinEOList = this.list(wrapper); @@ -43,6 +48,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper =new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getCreateBy,currentUser.getUsername()); wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); wrapper.ne(ProjectRxswinEO::getId,projectRxswinEO.getId()); @@ -67,6 +71,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl queryList() { return list(); } + + /** + * 调取--第一层 + * @param pageNo + * @param pageSize + * @param projectRxswinEO + * @return + */ + @Override + public Page getOnePage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { + List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(projectRxswinEO.getProjectId()); + for (ProjectLibraryBase projectLibraryBase : libraryBaseList) { + //项目名称 + String projectName = ""; + if(CutEnum.CN.getValue().equals(projectRxswinEO.getCut())){ + projectName = projectLibraryBase.getProjectName() + " " + projectLibraryBase.getYearName() + + "-" + projectLibraryBase.getTargetMarketNameCn() + "-" + projectLibraryBase.getProjectVersion(); + }else{ + projectName = projectLibraryBase.getProjectName() + " " + projectLibraryBase.getYearName() + + "-" + projectLibraryBase.getTargetMarketNameEn() + "-" + projectLibraryBase.getProjectVersion(); + } + projectLibraryBase.setProjectName(projectName); + } + Collections.sort(libraryBaseList); + return PageUtil.getPages(pageNo,pageSize,libraryBaseList); + } + + /** + * 调取--第二层 + * @param page + * @param projectRxswinEO + * @return + */ + @Override + public Page getTwoPage(Page page,ProjectRxswinEO projectRxswinEO) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); + wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的 + this.page(page,wrapper); + return this.page(page,wrapper); + } } From c870a6624704ef3e9ed62f88a053995109942653 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 16:36:32 +0800 Subject: [PATCH 06/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 9 +++++++ .../service/IProjectRxswinEOService.java | 7 ++++++ .../impl/ProjectRxswinEOServiceImpl.java | 25 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 20611b4f8..459947cbc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -218,4 +218,13 @@ public class ProjectRxswinEOController extends JeroController submitInfo(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="ids",required=true) String ids) { + projectRxswinEOService.submitInfo(projectId,ids); + return Result.OK("提交成功"); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index faa98032a..8e3d9dea1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -78,4 +78,11 @@ public interface IProjectRxswinEOService extends IService { * @return */ Page getTwoPage(Page page,ProjectRxswinEO projectRxswinEO); + + /** + * 提交 + * @param projectId + * @param ids + */ + void submitInfo(String projectId,String ids); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index e65ab32f5..66089f93e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -5,18 +5,23 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.enums.StatusEnum; import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; /** * @Description: rxswin表 @@ -158,4 +163,24 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + } + this.saveBatch(rxswinEOList); + } } From 6a3b345a731249765b0efae286300587e8cc5972 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 16:52:14 +0800 Subject: [PATCH 07/39] =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 9 ++++ .../service/IProjectRxswinEOService.java | 7 +++ .../impl/ProjectRxswinEOServiceImpl.java | 49 +++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 459947cbc..9f63d9e9c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -227,4 +227,13 @@ public class ProjectRxswinEOController extends JeroController iSExist(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="ids",required=true) String ids) { + String iSExist = projectRxswinEOService.iSExist(projectId, ids); + return Result.OK(iSExist); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 8e3d9dea1..548d3ce41 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -85,4 +85,11 @@ public interface IProjectRxswinEOService extends IService { * @param ids */ void submitInfo(String projectId,String ids); + + /** + * 覆盖验证 + * @param projectId + * @param ids + */ + String iSExist(String projectId,String ids); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 66089f93e..82bd94611 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -180,7 +180,56 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); + + //已存在的 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); + List rxswinEOS = this.list(wrapperTemp); + + if(!rxswinEOS.isEmpty()){ + List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); + List projectRxswinEOS = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); + if(projectRxswinEOS.isEmpty()){ + //直接新增 + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + this.saveBatch(rxswinEOList); + }else{ + return "YES"; + } + }else{ + //直接新增 + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + this.saveBatch(rxswinEOList); + } + return "NO"; + } } From 62c1e145a9584227d9f5dbad0968c9a34bc1b916 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 17:43:17 +0800 Subject: [PATCH 08/39] =?UTF-8?q?=E8=B0=83=E5=8F=96=E5=90=8E=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 17 ++++ .../modules/project/enums/StatusEnum.java | 2 + .../service/IProjectRxswinEOService.java | 3 + .../impl/ProjectRxswinEOServiceImpl.java | 78 +++++++++++++++---- 4 files changed, 84 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 9f63d9e9c..99f9f7159 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -236,4 +236,21 @@ public class ProjectRxswinEOController extends JeroControllerYES覆盖， flag-->NO不覆盖 + * @return + */ + @AutoLog(value = "调取后保存数据") + @ApiOperation(value="调取后保存数据", notes="调取后保存数据") + @GetMapping(value = "/addBatch") + public Result addBatch(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="ids",required=true) String ids, + @RequestParam(name="flag",required=true) String flag) { + projectRxswinEOService.addBatch(projectId, ids,flag); + return Result.OK(""); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java index 05c34bbd5..c28f22ee6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/StatusEnum.java @@ -6,6 +6,8 @@ package com.jero.modules.project.enums; public enum StatusEnum { SAVE("保存","0"), SUBMIT("提交","1"), + COVER_YES("覆盖","YES"), + COVER_NO("不覆盖","NO"), ; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 548d3ce41..382ed1de4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -92,4 +92,7 @@ public interface IProjectRxswinEOService extends IService { * @param ids */ String iSExist(String projectId,String ids); + + + void addBatch(String projectId,String ids,String flag); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 82bd94611..293c89d4b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -208,28 +208,74 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOS = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); if(projectRxswinEOS.isEmpty()){ //直接新增 - for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { - projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); - projectRxswinEO.setProjectId(projectId); - projectRxswinEO.setCreateTime(new Date()); - projectRxswinEO.setCreateBy(user.getUsername()); - projectRxswinEO.setState(StatusEnum.SAVE.getValue()); - } - this.saveBatch(rxswinEOList); + saveBatchInfo(projectId, user, rxswinEOList); }else{ return "YES"; } }else{ //直接新增 - for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { - projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); - projectRxswinEO.setProjectId(projectId); - projectRxswinEO.setCreateTime(new Date()); - projectRxswinEO.setCreateBy(user.getUsername()); - projectRxswinEO.setState(StatusEnum.SAVE.getValue()); - } - this.saveBatch(rxswinEOList); + saveBatchInfo(projectId, user, rxswinEOList); } return "NO"; } + + private void saveBatchInfo(String projectId, LoginUser user, List rxswinEOList) { + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + this.saveBatch(rxswinEOList); + } + + /** + * 调取后保存数据 + * @param projectId + * @param ids + * @param flag + */ + @Override + public void addBatch(String projectId, String ids,String flag) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //新增的 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); + + //已存在的 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); + List rxswinEOS = this.list(wrapperTemp); + + List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); + List yesList = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); + List noList = rxswinEOList.stream().filter(e -> !themeList.contains(e.getTheme())).collect(Collectors.toList()); + + + if(StatusEnum.COVER_YES.getValue().equals(flag)){ + //未存在的进行新增 + saveBatchInfo(projectId, user, noList); + + for (ProjectRxswinEO projectRxswinEO : yesList) { + List collect = rxswinEOS.stream() + .filter(e -> projectRxswinEO.getTheme().equals(e.getTheme())).collect(Collectors.toList()); + if(!collect.isEmpty()){ + projectRxswinEO.setId(collect.get(0).getId()); + projectRxswinEO.setCreateTime(collect.get(0).getCreateTime()); + } + projectRxswinEO.setUpdateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + //已存在的进行覆盖 + this.updateBatchById(yesList); + + + }else if(StatusEnum.COVER_NO.getValue().equals(flag)){ + saveBatchInfo(projectId, user, noList); + } + } } From 39b8d8511e6702800ab40d60aaffacb91dfbd89e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 28 Aug 2023 18:06:20 +0800 Subject: [PATCH 09/39] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 3 +- .../project/entity/ProjectRxswinEO.java | 4 ++ .../service/IProjectRxswinEOService.java | 2 + .../impl/ProjectRxswinEOServiceImpl.java | 46 +++++++++++++++++++ 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 99f9f7159..1a1978c0c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -63,8 +63,7 @@ public class ProjectRxswinEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = projectRxswinEOService.page(page, queryWrapper); + IPage pageList = projectRxswinEOService.getPageInfo(pageNo,pageSize, projectRxswinEO); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index 064d5804c..6722e3428 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -93,4 +93,8 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "中英文切换") private String cut; + @TableField(exist = false) + @ApiModelProperty(value = "编号") + private String serialNumber; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 382ed1de4..f777c2dad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -62,6 +62,8 @@ public interface IProjectRxswinEOService extends IService { */ List queryList(); + Page getPageInfo(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO); + /** * 调取--第一层 * @param pageNo diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 293c89d4b..2b708c2ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -7,11 +7,14 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.enums.StatusEnum; import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,6 +37,8 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getPageInfo(Integer pageNo,Integer pageSize, ProjectRxswinEO projectRxswinEO) { + LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); + + if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ + wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); + } + if(StringUtils.isNotBlank(projectRxswinEO.getVersion())){ + wrapper.eq(ProjectRxswinEO::getVersion,projectRxswinEO.getVersion()); + } + if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){ + wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin()); + } + + List projectRxswinEOList = this.list(wrapper); + + if(!projectRxswinEOList.isEmpty()){ + List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); + List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); + for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); + if(!collect.isEmpty()){ + projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); + } + } + if(StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())){ + projectRxswinEOList = projectRxswinEOList.stream() + .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); + } + } + return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); + } + /** * 调取--第一层 * @param pageNo @@ -278,4 +317,11 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getBussDocumentLibraryEOList(List documentIdList){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId,documentIdList); + return bussDocumentLibraryEOService.list(wrapper); + } } From 5a212a54f3a45005042d67bbfab8907b8470bf6c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 09:22:53 +0800 Subject: [PATCH 10/39] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 3 +- .../service/IProjectRxswinEOService.java | 5 ++- .../impl/ProjectRxswinEOServiceImpl.java | 39 ++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 1a1978c0c..eee80449d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -212,8 +212,7 @@ public class ProjectRxswinEOController extends JeroController page = new Page(pageNo, pageSize); - IPage pageList = projectRxswinEOService.getTwoPage(page,projectRxswinEO); + IPage pageList = projectRxswinEOService.getTwoPage(pageNo,pageSize,projectRxswinEO); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index f777c2dad..8eadcea48 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -75,11 +75,12 @@ public interface IProjectRxswinEOService extends IService { /** * 调取--第二层 - * @param page + * @param pageNo + * @param pageSize * @param projectRxswinEO * @return */ - Page getTwoPage(Page page,ProjectRxswinEO projectRxswinEO); + Page getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO); /** * 提交 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 2b708c2ed..1b10e7f4e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -190,17 +190,46 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getTwoPage(Page page,ProjectRxswinEO projectRxswinEO) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + public Page getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { + + LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的 - this.page(page,wrapper); - return this.page(page,wrapper); + + if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ + wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); + } + if(StringUtils.isNotBlank(projectRxswinEO.getVersion())){ + wrapper.eq(ProjectRxswinEO::getVersion,projectRxswinEO.getVersion()); + } + if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){ + wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin()); + } + + List projectRxswinEOList = this.list(wrapper); + + if(!projectRxswinEOList.isEmpty()){ + List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); + List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); + for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); + if(!collect.isEmpty()){ + projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); + } + } + if(StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())){ + projectRxswinEOList = projectRxswinEOList.stream() + .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); + } + } + return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); } /** From 17ffa7dbdcd8dc981a9c271dd0bc61d213d7abc5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 09:54:44 +0800 Subject: [PATCH 11/39] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 13 +++++++++++++ .../project/service/IProjectRxswinEOService.java | 2 ++ .../service/impl/ProjectRxswinEOServiceImpl.java | 12 ++++++++++++ 3 files changed, 27 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index eee80449d..f2d5e03bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -251,4 +251,17 @@ public class ProjectRxswinEOController extends JeroController> getVersionList(String projectId) { + List list = projectRxswinEOService.getVersionList(projectId); + return Result.OK(list); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 8eadcea48..13d9b1b03 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -98,4 +98,6 @@ public interface IProjectRxswinEOService extends IService { void addBatch(String projectId,String ids,String flag); + + List getVersionList(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 1b10e7f4e..7f05bb5f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -347,6 +347,18 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getVersionList(String projectId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId,projectId); + List rxswinEOList = this.list(wrapper); + List versionList = rxswinEOList.stream().map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); + Collections.sort(versionList,(a,b)->{ + return Integer.parseInt(a) - Integer.parseInt(b); + }); + return versionList; + } + public List getBussDocumentLibraryEOList(List documentIdList){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); From cb570dc40deb46e5e581eac16ea7da12af51ca7e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 10:18:12 +0800 Subject: [PATCH 12/39] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectRxswinEO.java | 8 ++ .../impl/ProjectRxswinEOServiceImpl.java | 81 ++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index 6722e3428..78cd7a299 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -97,4 +97,12 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "编号") private String serialNumber; + @TableField(exist = false) + @ApiModelProperty(value = "表头排序字段") + private java.lang.String orderByField; + + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private java.lang.String orderBy; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 7f05bb5f7..4ce068582 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -9,6 +9,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.enums.StatusEnum; @@ -19,10 +20,12 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.Collator; import java.util.Arrays; import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.UUID; import java.util.stream.Collectors; @@ -141,7 +144,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList = this.list(wrapper); if(!projectRxswinEOList.isEmpty()){ @@ -158,6 +163,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); } + heartSort(projectRxswinEO,projectRxswinEOList); } return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); } @@ -211,6 +217,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList = this.list(wrapper); @@ -228,6 +237,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); } + heartSort(projectRxswinEO,projectRxswinEOList); } return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); } @@ -365,4 +375,73 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList) { + Collator comparator = Collator.getInstance(Locale.CHINESE); + // 编号 + if ("serialNumber".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; + String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; + return comparator.compare(e1PlannedBpLaunchBatch, e2PlannedBpLaunchBatch); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; + String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; + return comparator.compare(e2PlannedBpLaunchBatch, e1PlannedBpLaunchBatch); + }); + } + } + // 主题 + if ("theme".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + //RXSWIN + if ("rxswin".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + + //对应版本 + if ("version".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + } } From 5964678d04f9a6ac454d919ef8c68f57d1e6e819 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 10:53:49 +0800 Subject: [PATCH 13/39] =?UTF-8?q?rxswin=E5=AF=B9=E6=8E=A5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 +- .../components/rxswinModel.vue | 180 +++++++++++------- .../components/transferListRxswin.vue | 7 +- .../components/transferListvirtalRxswin.vue | 176 +++++++++++------ 4 files changed, 233 insertions(+), 132 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e5cf99ed6..709bdd937 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1929,7 +1929,7 @@ module.exports = { softwareversion:'Software version', softwareplatform:'Software platform', softwarereleasetime:'Software release time', - theme:'theme', + theme:'Theme', influencestatute:'Influence statute', vdrste:'VDR status', impactdescription:'Impact description', diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 383320977..6faf9138b 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -14,8 +14,8 @@
{{$t('standard')}}
- +
@@ -25,8 +25,8 @@
{{$t('theme')}}
- +
@@ -34,8 +34,8 @@
RXSWIN
- +
@@ -48,8 +48,10 @@ show-search class="box-input-search" optionFilterProp="label" + showSearch + :autoClearSearchValue="false" :getPopupContainer="triggerNode=> triggerNode.parentNode" - v-model="queryParam.firstLevelDutyTerritory"> + v-model="queryParam.version">
+ +
+ + {{$t('submit')}} +
@@ -134,17 +141,17 @@ - - - - - - - - - - - +
+ +
{{$t('cancel')}} {{$t('determine')}} @@ -169,12 +176,13 @@ {{$t('standard')}}
- + + @change="StandardselectionChange" + v-model="formInline.serialNumber"/>
@@ -188,7 +196,7 @@
+ v-model="formInline.theme" :maxLength="100">
@@ -200,9 +208,9 @@ * RXSWIN
- + + v-model="formInline.rxswin" :maxLength="100">
@@ -221,13 +229,12 @@ import SelectedBy from '@/components/SelectedBy/index' import personBatting from './personBatting' import Standardselection from '@/components/Standardselection/index' - import { getAction, postAction, downloadFile, putAction } from '@/api/manage' + import { getAction, postAction, downloadFile, putAction, deleteAction } from '@/api/manage' import ImportFile from '@/components/ImportFile/index' import transferList from './transferListRxswin' import transferListvirtal from './transferListvirtalRxswin' import { mapGetters } from 'vuex' import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' - import { deleteAction } from '../../../api/manage' export default { name: 'listOfRelevantPersonnel', @@ -255,7 +262,7 @@ { title: this.$t('standard'), align: 'left', - dataIndex: 'standard', + dataIndex: 'serialNumber', ellipsis: true, sorter:true, width: 170 @@ -271,7 +278,7 @@ { title: 'RXSWIN', align: 'left', - dataIndex: 'RXSWIN', + dataIndex: 'rxswin', ellipsis: true, sorter:true, width: 170 @@ -279,7 +286,7 @@ { title: this.$t('Correspondingversion'), align: 'left', - dataIndex: 'Correspondingversion', + dataIndex: 'version', ellipsis: true, sorter:true, width: 170 @@ -299,17 +306,12 @@ confirmLoading: false, formInline: {}, rules: { - standard: [ + serialNumber: [ { required: true, message: this.$t('standard') + this.$t('cannotEmpty'), trigger: 'blur' }, - // { - // max: 100, - // message: this.$t('certifiedEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - // trigger: 'change' - // } ], theme: [ { @@ -317,30 +319,19 @@ message: this.$t('theme') + this.$t('cannotEmpty'), trigger: 'blur' }, - // { - // max: 100, - // message: this.$t('areaOfResponsibility') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - // trigger: 'change' - // } ], - RXSWIN: [ + rxswin: [ { required: true, message: 'RXSWIN' + this.$t('cannotEmpty'), trigger: 'blur' }, - // { - // max: 100, - // message: this.$t('regulatoryEngineer') + this.$t('cannotExceed') + 100 + this.$t('Characters'), - // trigger: 'change' - // } ], }, - // total: 0, // pageSize: 10, // pageNo: 1, url: { - page: '/project/projectRelatedPersonnel/page', + page: '/project/projectRxswinEO/page', edit: '/project/projectRelatedPersonnel/edit', exportData: '/project/projectRelatedPersonnel/exportXls', importZipUrl: '/project/projectRelatedPersonnel/importExcel', @@ -353,6 +344,9 @@ userName:'', orderBy: '1', orderByField: '', + total: 0, + pageNo: 1, + pageSize: 10 } }, computed: { @@ -406,20 +400,38 @@ handleSubmit() { this.visible = false }, + submit(){ + let ids = [] + this.dataSource.forEach(item => { + ids.push(item.id) + }) + let query = { + projectId: this.$route.query.id, + ids: ids.join(',') + } + getAction('/project/projectRxswinEO/submitInfo', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, batDeleteClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - // postAction('/project/problemKnowledgeBaseReplyEO/deleteBatch', { ids: this.selectedRowKeys }).then((res) => { - // if (res.success) { - // _this.$message.success(_this.$t('OperationSuccessful')) - // _this.getList() - // } else { - // _this.$message.warning(res.message) - // } - // }) + deleteAction('/project/projectRxswinEO/deleteBatch', { ids: _this.selectedRowKeys.join(',') }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) } }) } else { @@ -433,14 +445,28 @@ getPersonnelList() { this.getList() }, + StandardselectionChange(value, id) { + this.formInline.documentId = id + this.formInline = { ...this.formInline } + }, editOk() { this.$refs.ruleForm.validate(valid => { if (valid) { - if (!this.formInline.certificationEngineer) { - this.formInline.certificationEngineer = '' + let url = '' + let Action = '' + if(this.title == this.$t('newlyAdded')){ + url = '/project/projectRxswinEO/add' + Action = postAction + }else{ + url = '/project/projectRxswinEO/edit' + Action = putAction + } + let query = { + projectId: this.$route.query.id, + ...this.formInline, } this.confirmLoading = true - putAction(this.url.edit, this.formInline).then((res) => { + Action(url, query).then((res) => { if (res.success) { this.editVisible = false this.$message.success(this.$t('OperationSuccessful')) @@ -475,14 +501,14 @@ this.$confirm({ content: _this.$t('ConfirmDelete'), onOk() { - // postAction('/project/problemKnowledgeBaseReplyEO/deleteBatch', { ids: item.id }).then((res) => { - // if (res.success) { - // _this.$message.success(_this.$t('OperationSuccessful')) - // _this.getList() - // } else { - // _this.$message.warning(res.message) - // } - // }) + deleteAction('/project/projectRxswinEO/deleteBatch', { ids: item.id }).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) } }) }, @@ -502,18 +528,34 @@ ...this.queryParam, orderBy: this.orderBy, orderByField: this.orderByField, + pageNo: this.pageNo, + pageSize: this.pageSize } this.loading = true - postAction(this.url.page, query).then((res) => { + getAction(this.url.page, query).then((res) => { if (res.success) { - this.dataSource = res.result || [] - // this.total = res.result.total + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.getList() + return + } + this.dataSource = res.result.records || [] + this.total = res.result.total this.loading = false } else { this.loading = false } }) }, + pageOnChange(page, pageSize) { + this.pageNo = page + this.getList() + }, + SizeChange(page, pageSize) { + this.pageNo = 1 + this.pageSize = pageSize + this.getList() + }, handleExport() { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { diff --git a/jero-web/src/views/projectManagement/components/transferListRxswin.vue b/jero-web/src/views/projectManagement/components/transferListRxswin.vue index d19b84601..06462dac8 100644 --- a/jero-web/src/views/projectManagement/components/transferListRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListRxswin.vue @@ -59,14 +59,14 @@ columns: [ { title: this.$t('projectVersion'), - dataIndex: 'name', + dataIndex: 'projectName', align: 'left', ellipsis: true, width: 235 }, { title: this.$t('Listcreationtime'), - dataIndex: 'useExplain', + dataIndex: 'createTime', align: 'left', ellipsis: true, }, @@ -109,12 +109,13 @@ }, replacePage() { let query = { + projectId: this.$route.query.id, pageNo: this.pageNo, pageSize: this.pageSize, ...this.queryParam } this.loading = true - postAction(this.url.transferUrl, query).then((res) => { + getAction('/project/projectRxswinEO/getOnePage', query).then((res) => { if (res.success) { this.dataList = res.result.records || [] this.total = res.result.total diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index b60182499..1ba72f7a2 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -12,32 +12,70 @@
- -
-
+ +
+
{{$t('standard')}}
- +
- -
-
- {{$t('title')}} + + + + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} @@ -52,18 +90,18 @@ :loading="loading"> - - - - - - - - - - - - +
+ +
@@ -85,6 +123,7 @@ export default { props: ['url'], data() { return { + toggleSearchStatus: false, visible: false, queryParam: {}, confirmLoading: false, @@ -201,11 +240,14 @@ export default { methods: { transferModel(id) { this.visible = true - this.dummyInventoryBaseId = id + this.projectId = id this.queryParam = {} this.selectedRowKeys = [] this.replacePage() }, + handleToggleSearch() { + this.toggleSearchStatus = !this.toggleSearchStatus + }, searchQuery() { this.pageNo = 1 this.replacePage() @@ -214,8 +256,6 @@ export default { this.pageNo = 1 this.queryParam = {} this.replacePage() - this.$refs.globalAdvancedQueryRef.resetLine() - this.$refs.globalAdvancedQueryRef.emitCallback() }, onChange(page, pageSize) { this.pageNo = page @@ -226,31 +266,17 @@ export default { this.pageSize = pageSize this.replacePage() }, - handleSuperQuery(params, matchType) { - let sqp = {} - if (!params || (params && params.length == 0)) { - sqp['superQueryParams'] = '' - this.$refs.globalAdvancedQueryRef.superQueryFlag = false - } else { - this.$refs.globalAdvancedQueryRef.superQueryFlag = true - sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) - sqp['superQueryMatchType'] = matchType - } - this.queryParamQuery = sqp - this.replacePage() - }, replacePage() { let query = { - // pageNo: this.pageNo, - // pageSize: this.pageSize, - ...this.queryParamQuery, + pageNo: this.pageNo, + pageSize: this.pageSize, ...this.queryParam, - dummyInventoryBaseId: this.dummyInventoryBaseId + projectId: this.projectId } this.loading = true - getAction('/dummy/dummyInventoryInfoEO/list', query).then((res) => { + getAction('/project/projectRxswinEO/getTwoPage', query).then((res) => { if (res.success) { - this.dataList = res.result || [] + this.dataList = res.result.records || [] this.loading = false } else { this.loading = false @@ -270,10 +296,10 @@ export default { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - postAction('project/projectLawsInventoryEO/add', { - dummyInventoryBaseId: this.dummyInventoryBaseId, - projectLibraryId: this.$route.query.id, - dummyids: selectedRowKeys.join(','), + getAction('/project/projectRxswinEO/iSExist', { + projectId: this.projectId, + // projectLibraryId: this.$route.query.id, + ids: selectedRowKeys.join(','), }).then((res) => { if (res.success) { this.confirmLoading = false @@ -345,4 +371,36 @@ export default { .box-button { height: 38px; } +.box-title-text-search { + line-height: 1.4; + display: flex; + align-items: center; + margin-bottom: 10px; +} + +.title-text-search { + width: 110px; + color: #000F16; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + margin-top: 3px; + text-align: right; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.box-input-search { + display: inline-block; + width: calc(100% - 100px); + height: 38px; + margin-top: 2px; +} + +.box-button-search { + height: 38px; + /*margin-top: 2px;*/ +} \ No newline at end of file From debf2e65fc70610dd6972e69f35b4a5046a491d0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 11:02:07 +0800 Subject: [PATCH 14/39] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/rxswinModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 6faf9138b..90fdb2d38 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -355,7 +355,7 @@ methods: { ...mapGetters(['userInfo']), getFirstLevelDutyTerritory() { - getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + getAction('/project/projectRxswinEO/getVersionList', {projectId: this.$route.query.id}).then((res) => { if (res.success) { this.firstLevelDutyTerritoryList = res.result } else { From 4734033048dbe2348bd35def316bff2d8a037f4e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:14:03 +0800 Subject: [PATCH 15/39] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 7 +- .../project/entity/ProjectRxswinEO.java | 12 +- .../project/entity/ProjectRxswinEOEn.java | 108 ++++++++++++++++++ .../service/IProjectRxswinEOService.java | 6 +- .../impl/ProjectRxswinEOServiceImpl.java | 57 ++++++++- 5 files changed, 176 insertions(+), 14 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index f2d5e03bc..432eb0e1d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.PageUtil; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.service.IProjectRxswinEOService; @@ -63,8 +64,9 @@ public class ProjectRxswinEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(projectRxswinEO, req.getParameterMap()); - IPage pageList = projectRxswinEOService.getPageInfo(pageNo,pageSize, projectRxswinEO); - return Result.OK(pageList); + List projectRxswinEOList = projectRxswinEOService.getPageInfo(projectRxswinEO); + Page pages = PageUtil.getPages(pageNo, pageSize, projectRxswinEOList); + return Result.OK(pages); } /** @@ -161,6 +163,7 @@ public class ProjectRxswinEOController extends JeroController保存，1->提交）*/ - @Excel(name = "状态（0->保存，1->提交）", width = 15) @ApiModelProperty(value = "状态（0->保存，1->提交）") private java.lang.String state; @@ -93,9 +95,7 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "中英文切换") private String cut; - @TableField(exist = false) - @ApiModelProperty(value = "编号") - private String serialNumber; + @TableField(exist = false) @ApiModelProperty(value = "表头排序字段") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java new file mode 100644 index 000000000..5d560ac66 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java @@ -0,0 +1,108 @@ +package com.jero.modules.project.entity; + +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 com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: rxswin表 + * @Author: jero-boot + * @Date: 2023-08-28 + * @Version: V1.0 + */ +@Data +@TableName("project_rxswin") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_rxswin对象", description="rxswin表") +public class ProjectRxswinEOEn 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; + + /**项目id*/ + @ApiModelProperty(value = "项目id") + private String projectId; + + /**文档库id（编号）*/ + @ApiModelProperty(value = "文档库id（编号）") + private String documentId; + + @TableField(exist = false) + @ApiModelProperty(value = "编号") + @Excel(name = "No.", width = 15) + private String serialNumber; + + /**主题*/ + @Excel(name = "Theme", width = 15) + @ApiModelProperty(value = "主题") + private String theme; + + /**RXSWIN*/ + @Excel(name = "RXSWIN", width = 15) + @ApiModelProperty(value = "RXSWIN") + private String rxswin; + + /**版本*/ + @Excel(name = "Corresponding version", width = 15) + @ApiModelProperty(value = "版本") + private String version; + + /**状态（0->保存，1->提交）*/ + @ApiModelProperty(value = "状态（0->保存，1->提交）") + private String state; + + @TableField(exist = false) + @ApiModelProperty(value = "中英文切换") + private String cut; + + + + @TableField(exist = false) + @ApiModelProperty(value = "表头排序字段") + private String orderByField; + + @TableField(exist = false) + @ApiModelProperty(value = "排序") + private String orderBy; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 13d9b1b03..1804ea89e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; +import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -62,7 +64,7 @@ public interface IProjectRxswinEOService extends IService { */ List queryList(); - Page getPageInfo(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO); + List getPageInfo(ProjectRxswinEO projectRxswinEO); /** * 调取--第一层 @@ -100,4 +102,6 @@ public interface IProjectRxswinEOService extends IService { void addBatch(String projectId,String ids,String flag); List getVersionList(String projectId); + + ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 4ce068582..a222d0adf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PageUtil; +import com.jero.common.util.oConvertUtils; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.dummy.enums.OrderEnum; @@ -17,9 +18,12 @@ import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpServletRequest; import java.text.Collator; import java.util.Arrays; import java.util.Collections; @@ -132,7 +136,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getPageInfo(Integer pageNo,Integer pageSize, ProjectRxswinEO projectRxswinEO) { + public List getPageInfo(ProjectRxswinEO projectRxswinEO) { LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ @@ -165,7 +169,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); @@ -273,7 +277,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); //已存在的 @@ -320,7 +324,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); //已存在的 @@ -369,6 +373,49 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl pageList = getPageInfo(projectRxswinEO); + List exportList = null; + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } + + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); +// if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) { +// List dataList = new ArrayList<>(); +// for (ProjectRxswinEO projectRxswinEOTEmp : exportList) { +// OtaExportCnVO otaExportCnVO = new OtaExportCnVO(); +// BeanUtils.copyProperties(projectRxswinEOTEmp, otaExportCnVO); +// dataList.add(otaExportCnVO); +// } +// mv.addObject(NormalExcelConstants.CLASS, OtaExportCnVO.class); +// mv.addObject(NormalExcelConstants.DATA_LIST, dataList); +// ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); +// mv.addObject(NormalExcelConstants.PARAMS, exportParams); +// } else { +// List dataList = new ArrayList<>(); +// for (OtaManageApplyEO manageApplyEO : exportList) { +// OtaExportEnVO otaExportEnVO = new OtaExportEnVO(); +// BeanUtils.copyProperties(manageApplyEO, otaExportEnVO); +// dataList.add(otaExportEnVO); +// } +// mv.addObject(NormalExcelConstants.CLASS, OtaExportEnVO.class); +// mv.addObject(NormalExcelConstants.DATA_LIST, dataList); +// ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); +// mv.addObject(NormalExcelConstants.PARAMS, exportParams); +// } + return mv; + } + public List getBussDocumentLibraryEOList(List documentIdList){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); From e1ce57b239434465557cd8330e7646f790e31ef8 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 11:20:22 +0800 Subject: [PATCH 16/39] =?UTF-8?q?rxswin=E8=B0=83=E5=8F=96=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rxswinModel.vue | 22 +++++++------ .../components/transferListvirtalRxswin.vue | 31 +++++++++++++++++-- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 90fdb2d38..b7a8e7be0 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -78,17 +78,17 @@
-
+
{{$t('submit')}}
-
+
{{$t('newlyAdded')}}
-
+
{{$t('templateDownload')}}
@@ -98,20 +98,20 @@ {{$t('export')}}
-
-
{{$t('BatchDelete')}}
-
@@ -133,10 +133,10 @@ :loading="loading" > - + {{$t('edit')}} - + {{$t('delete')}} @@ -346,7 +346,8 @@ orderByField: '', total: 0, pageNo: 1, - pageSize: 10 + pageSize: 10, + staFlag:'', } }, computed: { @@ -540,6 +541,9 @@ return } this.dataSource = res.result.records || [] + if(this.dataSource.length != 0 && this.dataSource[0].state == '1'){ + this.staFlag = '1' + } this.total = res.result.total this.loading = false } else { diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index 1ba72f7a2..e00bcc754 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -303,10 +303,35 @@ export default { }).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) - this.visible = false + // this.$message.success(this.$t('OperationSuccessful')) + if(res.result.flag == 'YES'){ + let _this = this + this.$confirm({ + content: _this.$t('AlreadyExists'), + onOk() { + geteAction('/project/projectRxswinEO/addBatch', { + ids: this.selectedRowKeys.join(','), + flag:'YES', + projectId: this.projectId, + }).then((res) => { + if (res.success) { + _this.$message.success(this.$t('OperationSuccessful')) + _this.$emit('transferListFormHomo') + } else { + _this.$message.warning(res.message) + } + }) + }, + onCancel() { + _this.$emit('transferListFormHomo') + } + }) + }else{ + this.visible = false + this.$message.success(this.$t('OperationSuccessful')) + this.$emit('transferListFormHomo') + } this.selectedRowKeys = [] - this.$emit('transferListFormHomo') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false From 8588c1aa0ca6ef8d5675213e3fb0639098899ea8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:28:23 +0800 Subject: [PATCH 17/39] =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectRxswinEOServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index a222d0adf..734dfc54d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -366,7 +366,9 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProjectRxswinEO::getProjectId,projectId); List rxswinEOList = this.list(wrapper); - List versionList = rxswinEOList.stream().map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); + List versionList = rxswinEOList.stream() + .filter(e->StringUtils.isNotBlank(e.getVersion())) + .map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); Collections.sort(versionList,(a,b)->{ return Integer.parseInt(a) - Integer.parseInt(b); }); From 283fb2e1309e8d674ed32eb42833122a06fad95c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:39:01 +0800 Subject: [PATCH 18/39] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectRxswinEOServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 734dfc54d..078e1f7c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -138,6 +138,10 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getPageInfo(ProjectRxswinEO projectRxswinEO) { LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); + if(StringUtils.isBlank(projectRxswinEO.getProjectId())){ + return new ArrayList<>(); + } + wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); From 27fcf3f1f81b5f9522c4bcf7d4cfebaebdb8961e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 11:39:06 +0800 Subject: [PATCH 19/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/rxswinModel.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index b7a8e7be0..6b4686004 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -465,6 +465,7 @@ let query = { projectId: this.$route.query.id, ...this.formInline, + version:this.$route.query.projectVersion } this.confirmLoading = true Action(url, query).then((res) => { From 059bbed2cea79771682c42706eba9dbad0e02b5d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 11:43:26 +0800 Subject: [PATCH 20/39] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 3 +- .../impl/ProjectRxswinEOServiceImpl.java | 45 +++++++++---------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index 432eb0e1d..b880c9052 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -163,8 +163,7 @@ public class ProjectRxswinEOController extends JeroController dataList = new ArrayList<>(); -// for (ProjectRxswinEO projectRxswinEOTEmp : exportList) { -// OtaExportCnVO otaExportCnVO = new OtaExportCnVO(); -// BeanUtils.copyProperties(projectRxswinEOTEmp, otaExportCnVO); -// dataList.add(otaExportCnVO); -// } -// mv.addObject(NormalExcelConstants.CLASS, OtaExportCnVO.class); -// mv.addObject(NormalExcelConstants.DATA_LIST, dataList); -// ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); -// mv.addObject(NormalExcelConstants.PARAMS, exportParams); -// } else { -// List dataList = new ArrayList<>(); -// for (OtaManageApplyEO manageApplyEO : exportList) { -// OtaExportEnVO otaExportEnVO = new OtaExportEnVO(); -// BeanUtils.copyProperties(manageApplyEO, otaExportEnVO); -// dataList.add(otaExportEnVO); -// } -// mv.addObject(NormalExcelConstants.CLASS, OtaExportEnVO.class); -// mv.addObject(NormalExcelConstants.DATA_LIST, dataList); -// ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); -// mv.addObject(NormalExcelConstants.PARAMS, exportParams); -// } + if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) { + mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); + } else { + List dataList = new ArrayList<>(); + for (ProjectRxswinEO projectRxswinEOTemp : exportList) { + ProjectRxswinEOEn projectRxswinEOEn = new ProjectRxswinEOEn(); + BeanUtils.copyProperties(projectRxswinEOTemp, projectRxswinEOEn); + dataList.add(projectRxswinEOEn); + } + mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEOEn.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN"); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); + } return mv; } From 22484b6cf9b6db677d009195ce97b7e7a8d79679 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 13:48:38 +0800 Subject: [PATCH 21/39] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectRxswinEOServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index b4b58a459..34aedc963 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -267,13 +267,10 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl rxswinEOList = this.list(wrapper); for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { - projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); - projectRxswinEO.setProjectId(projectId); - projectRxswinEO.setCreateTime(new Date()); - projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setUpdateBy(user.getUsername()); projectRxswinEO.setState(StatusEnum.SUBMIT.getValue()); } - this.saveBatch(rxswinEOList); + this.updateBatchById(rxswinEOList); } /** * 覆盖验证 From c0fa0c462a9b8364b4df6b7829eaf6c6889d4c8f Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 13:56:10 +0800 Subject: [PATCH 22/39] =?UTF-8?q?=E8=B0=83=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ProjectDetails.vue | 7 +- .../components/rxswinModel.vue | 10 +- .../components/transferListvirtalRxswin.vue | 131 +++++------------- 3 files changed, 44 insertions(+), 104 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index bf8446f3f..739c6cbf6 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -70,12 +70,13 @@ >{{queryForm.vehiclePlatform}}
- RXSWIN - RXSWIN + - RXSWIN{{$t('detailedList')}} + + RXSWIN{{$t('detailedList')}}
diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 6b4686004..98265426f 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -54,10 +54,10 @@ v-model="queryParam.version"> - - {{ item.key }} + :label="item" + :value="item"> + + {{ item }} @@ -78,7 +78,7 @@
-
+
{{$t('submit')}}
diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index e00bcc754..fdded68ee 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -41,31 +41,31 @@ v-model="queryParam.rxswin">
- -
-
- {{$t('Correspondingversion')}} -
- - - - {{ item.key }} - - - -
- + + + + + + + + + + + + + + + + + + + + + + + + + @@ -132,7 +132,7 @@ export default { { title: this.$t('standard'), align: 'left', - dataIndex: 'standard', + dataIndex: 'serialNumber', ellipsis: true, sorter:true, width: 170 @@ -148,7 +148,7 @@ export default { { title: 'RXSWIN', align: 'left', - dataIndex: 'RXSWIN', + dataIndex: 'rxswin', ellipsis: true, sorter:true, width: 170 @@ -156,75 +156,12 @@ export default { { title: this.$t('Correspondingversion'), align: 'left', - dataIndex: 'Correspondingversion', + dataIndex: 'version', ellipsis: true, sorter:true, width: 170 }, ], - fieldList: [ - { - type: 'string', - value: 'subtitle', - text: this.$t('subtitle') - }, - { - type: '', - value: 'region', - text: this.$t('zoneOfApplication'), - dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, - { - type: 'string', - value: 'correspondingStandard', - text: this.$t('correspondingStandard') - }, - { - type: '', - value: 'implementType', - text: this.$t('implementationCategory'), - dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, - { - type: 'date', - value: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - text: this.$t('ImplementationDate') - }, - { - type: 'date', - value: 'implementTime', - text: this.$t('vehicleInProductionDate') - }, - { - type: '', - value: 'attestationType', - text: this.$t('certificationType'), - dictCode: 'attestation_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, - { - type: '', - value: 'attestationRank', - text: this.$t('certificationLevel'), - dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, - { - type: 'string', - value: 'applicableSupplement', - text: this.$t('applicableSupplement') - }, - { - type: 'string', - value: 'wvtaId', - text: 'WVTA ID' - }, - { - type: '', - value: 'dutyTerritory', - text: this.$t('areaOfResponsibility'), - dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 - }, - - ], dataList: [], content: [], loading: false, @@ -304,18 +241,19 @@ export default { if (res.success) { this.confirmLoading = false // this.$message.success(this.$t('OperationSuccessful')) - if(res.result.flag == 'YES'){ + if(res.result == 'YES'){ let _this = this this.$confirm({ content: _this.$t('AlreadyExists'), onOk() { - geteAction('/project/projectRxswinEO/addBatch', { - ids: this.selectedRowKeys.join(','), + getAction('/project/projectRxswinEO/addBatch', { + ids: selectedRowKeys.join(','), flag:'YES', - projectId: this.projectId, + projectId: _this.projectId, }).then((res) => { if (res.success) { - _this.$message.success(this.$t('OperationSuccessful')) + _this.$message.success(_this.$t('OperationSuccessful')) + _this.visible = false _this.$emit('transferListFormHomo') } else { _this.$message.warning(res.message) @@ -323,6 +261,7 @@ export default { }) }, onCancel() { + this.visible = false _this.$emit('transferListFormHomo') } }) From 6e804a406385439fc1b3bd21078a418f3e9fd495 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 14:12:13 +0800 Subject: [PATCH 23/39] =?UTF-8?q?=E8=B0=83=E5=8F=96-=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/mapper/ProjectRxswinEOMapper.java | 3 ++- .../project/mapper/xml/ProjectRxswinEOMapper.xml | 4 ++-- .../service/impl/ProjectRxswinEOServiceImpl.java | 14 +++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java index d63e2dfe9..714a1bcc0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectRxswinEOMapper.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProjectRxswinEOMapper extends BaseMapper { - List queryProjectLibraryBaseList(@Param("projectLibraryId") String projectLibraryId); + List queryProjectLibraryBaseList(@Param("id") String id, + @Param("parentId") String parentId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml index 1f2a844c6..ed116b16d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectRxswinEOMapper.xml @@ -34,7 +34,7 @@ LEFT JOIN project_name_info AS pni ON plb.project_name_id = pni.id LEFT JOIN project_year_name_info AS pyni ON plb.year_name_id = pyni.id LEFT JOIN sys_dict_item AS sdi ON sdi.item_value = plb.target_market - where plb.parent_id = #{projectLibraryId} - or plb.id = #{projectLibraryId} + where plb.parent_id = #{parentId} + or plb.id = #{id} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 34aedc963..2118d7edf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -51,6 +51,8 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl getOnePage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { - List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(projectRxswinEO.getProjectId()); + ProjectLibraryBase libraryBase = projectLibraryBaseService.getById(projectRxswinEO.getProjectId()); + String id = ""; + String parentId = ""; + if(StringUtils.isBlank(libraryBase.getParentId())){ + id = libraryBase.getId(); + parentId = libraryBase.getId(); + }else{ + id = libraryBase.getParentId(); + parentId = libraryBase.getParentId(); + } + List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(id,parentId); for (ProjectLibraryBase projectLibraryBase : libraryBaseList) { //项目名称 String projectName = ""; From 2307ae598df1f586cd7ab0dba2b44e320eb13844 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 14:19:59 +0800 Subject: [PATCH 24/39] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/transferListvirtalRxswin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index fdded68ee..8b11fd09d 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -261,7 +261,7 @@ export default { }) }, onCancel() { - this.visible = false + _this.visible = false _this.$emit('transferListFormHomo') } }) From 044e1ea8c79bea828844613d05cc86de3478ec92 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 14:23:33 +0800 Subject: [PATCH 25/39] =?UTF-8?q?=E8=A6=86=E7=9B=96=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/service/impl/ProjectRxswinEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 2118d7edf..43f4e1e11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -295,6 +295,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId, projectId); wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); From 5f8f6b3b9948e700870ef95b52a9e171d1b1c976 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 14:23:47 +0800 Subject: [PATCH 26/39] =?UTF-8?q?=E8=B0=83=E5=8F=96=E8=A6=86=E7=9B=96?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E9=A1=B9=E7=9B=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/transferListvirtalRxswin.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue index 8b11fd09d..f3e961882 100644 --- a/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue +++ b/jero-web/src/views/projectManagement/components/transferListvirtalRxswin.vue @@ -234,7 +234,7 @@ export default { this.confirmLoading = true let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) getAction('/project/projectRxswinEO/iSExist', { - projectId: this.projectId, + projectId: this.$route.query.id, // projectLibraryId: this.$route.query.id, ids: selectedRowKeys.join(','), }).then((res) => { @@ -249,7 +249,7 @@ export default { getAction('/project/projectRxswinEO/addBatch', { ids: selectedRowKeys.join(','), flag:'YES', - projectId: _this.projectId, + projectId: _this.$route.query.id, }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) From 3444dc4c0de9239bbb1aadf914da783a2463107d Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 14:33:59 +0800 Subject: [PATCH 27/39] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/rxswinModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 98265426f..fe7de088e 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -475,7 +475,7 @@ this.confirmLoading = false this.getList() } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) this.confirmLoading = false } }) From 7ba8679d46b5a37a5945b3823cb3add9059ac0fa Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 15:04:54 +0800 Subject: [PATCH 28/39] =?UTF-8?q?=E4=BF=9D=E5=AD=98=20=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/controller/ProjectRxswinEOController.java | 2 ++ .../project/service/impl/ProjectRxswinEOServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index b880c9052..a4c21a126 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -161,6 +161,8 @@ public class ProjectRxswinEOController extends JeroController wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getProjectId, projectId); +// wrapper.eq(ProjectRxswinEO::getProjectId, projectId); wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); List rxswinEOList = this.list(wrapper); @@ -370,6 +370,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl Date: Tue, 29 Aug 2023 15:14:19 +0800 Subject: [PATCH 29/39] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/controller/ProjectRxswinEOController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index a4c21a126..feb7ccc85 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -161,7 +161,6 @@ public class ProjectRxswinEOController extends JeroController Date: Tue, 29 Aug 2023 15:28:06 +0800 Subject: [PATCH 30/39] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardselectionRxswin/index.vue | 289 ++++++++++++++++++ .../components/rxswinModel.vue | 21 +- 2 files changed, 303 insertions(+), 7 deletions(-) create mode 100644 jero-web/src/components/StandardselectionRxswin/index.vue diff --git a/jero-web/src/components/StandardselectionRxswin/index.vue b/jero-web/src/components/StandardselectionRxswin/index.vue new file mode 100644 index 000000000..4d762cc9f --- /dev/null +++ b/jero-web/src/components/StandardselectionRxswin/index.vue @@ -0,0 +1,289 @@ + + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index fe7de088e..db55b85b6 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -180,7 +180,6 @@ @@ -228,7 +227,7 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import SelectedBy from '@/components/SelectedBy/index' import personBatting from './personBatting' - import Standardselection from '@/components/Standardselection/index' + import Standardselection from '@/components/StandardselectionRxswin/index' import { getAction, postAction, downloadFile, putAction, deleteAction } from '@/api/manage' import ImportFile from '@/components/ImportFile/index' import transferList from './transferListRxswin' @@ -333,7 +332,7 @@ url: { page: '/project/projectRxswinEO/page', edit: '/project/projectRelatedPersonnel/edit', - exportData: '/project/projectRelatedPersonnel/exportXls', + exportData: '/project/projectRxswinEO/exportXls', importZipUrl: '/project/projectRelatedPersonnel/importExcel', queryCertificationEngineer: '/project/projectRelatedPersonnel/queryCertificationEngineer' }, @@ -563,11 +562,19 @@ }, handleExport() { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) - let query = { - id: selectedRowKeys.join(','), - projectId: this.$route.query.id + let long = localStorage.getItem('language') + let cut = '' + if (long && long == 'zh-cn') { + this.cut = 'cn' + } else if (long && long == 'en-us') { + this.cut = 'en' } - downloadFile(this.url.exportData, this.$t('ListOfRelevantPersonnel') + '.xls', query, this.Deselect) + let query = { + ids: selectedRowKeys.join(','), + cut:cut + // projectId: this.$route.query.id + } + downloadFile(this.url.exportData, 'RXSWIN' + '.xls', query, this.Deselect) }, Deselect() { this.selectedRowKeys = [] From b62750e2c92da60cfb08bdd0d13a036d7a689321 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Aug 2023 15:44:07 +0800 Subject: [PATCH 31/39] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectRxswinEOController.java | 11 ++- .../service/IProjectRxswinEOService.java | 4 ++ .../impl/ProjectRxswinEOServiceImpl.java | 72 +++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java index feb7ccc85..89eb4b04e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRxswinEOController.java @@ -31,9 +31,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; - /** +/** * @Description: rxswin表 * @Author: jero-boot * @Date: 2023-08-28 @@ -162,7 +163,7 @@ public class ProjectRxswinEOController extends JeroController map, HttpServletResponse response, HttpServletRequest request) throws Exception { + projectRxswinEOService.exportTemplate(map, response, request); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 1804ea89e..3d8f87098 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -7,7 +7,9 @@ import com.jero.modules.project.entity.ProjectRxswinEO; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * @Description: rxswin表 @@ -104,4 +106,6 @@ public interface IProjectRxswinEOService extends IService { List getVersionList(String projectId); ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO); + + void exportTemplate(Map map, HttpServletResponse response, HttpServletRequest request); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 1b00b5952..1c78e92a8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.project.service.impl; +import com.aliyuncs.utils.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -18,16 +19,25 @@ import com.jero.modules.project.enums.StatusEnum; import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.VerticalAlignment; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.File; +import java.io.OutputStream; import java.text.Collator; import java.util.ArrayList; import java.util.Arrays; @@ -35,6 +45,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; @@ -53,6 +64,8 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl map, HttpServletResponse response, HttpServletRequest request) { + OutputStream os = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + String cut = (String) map.get("cut"); + String sheetName = ""; + if(com.jero.modules.system.util.StringUtils.equals(cut,CutEnum.CN.getValue())){ + sheetName = "RXSWIN"; + }else { + sheetName = "RXSWIN"; + } + String fileOriName = "文档库导入模板.xls"; + String filePath = uploadpath + File.separator + fileOriName; + try { + List list = new ArrayList<>(); + if(CutEnum.CN.getValue().equals((String) map.get("cut"))){ + list.add("编号,主题,RXSWIN,对应版本"); + }else{ + list.add("No.,Theme,RXSWIN,Corresponding version"); + } + //创建临时文件夹 + File nowFile = new File(filePath); + if (nowFile.exists()) { + nowFile.delete(); + } + nowFile.mkdirs(); + HSSFSheet sheet = workbook.createSheet(sheetName); + sheet.setDefaultColumnWidth(16);//列宽 + HSSFCellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setWrapText(true);//自动换行 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + + for (int i = 0; i < 1; i++) { + //表头 + Row row = sheet.createRow(i);//开始创建标题行 + String exportFieldName = list.get(i); + if (i == 0) { + if (com.jero.modules.system.util.StringUtils.isNotBlank(exportFieldName)) { + String[] headerArr = exportFieldName.split(","); + for (int j = 0; j < headerArr.length; j++) { + row.createCell(j).setCellValue(headerArr[j]); + } + } + } + } + response.setHeader("Content-Disposition", + "attachment; filename=\"" + fileOriName + ".xls"); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(os); + } catch (Exception e) { + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + } + + } } From 841a0cb8ba9d6bc09df98d21895c318bdd97660a Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 15:51:28 +0800 Subject: [PATCH 32/39] =?UTF-8?q?rxswin=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/rxswinModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index db55b85b6..1056d18be 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -580,7 +580,7 @@ this.selectedRowKeys = [] }, handleModule() { - downloadFile('project/projectRelatedPersonnel/exportTemplate', this.$t('ListOfRelevantPersonnel') + '.xls', {}) + downloadFile('project/projectRxswinEO/exportTemplate', 'RXSWIN' + '.xls', {}) }, //调取 transferClick() { From f8b6572e88aa2162dec43f2e68b825d89e6ff161 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 15:59:34 +0800 Subject: [PATCH 33/39] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=ACid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/rxswinModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 1056d18be..a67c7dca4 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -572,7 +572,7 @@ let query = { ids: selectedRowKeys.join(','), cut:cut - // projectId: this.$route.query.id + projectId: this.$route.query.id } downloadFile(this.url.exportData, 'RXSWIN' + '.xls', query, this.Deselect) }, From fcc1e726246f11d2063be9a15697d0e8e919c3bb Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Tue, 29 Aug 2023 16:01:57 +0800 Subject: [PATCH 34/39] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=ACid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/rxswinModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index a67c7dca4..e20af5f48 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -571,7 +571,7 @@ } let query = { ids: selectedRowKeys.join(','), - cut:cut + cut:cut, projectId: this.$route.query.id } downloadFile(this.url.exportData, 'RXSWIN' + '.xls', query, this.Deselect) From 70eb93e9428d712adb75f5a92c92194f41256b32 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 30 Aug 2023 13:51:14 +0800 Subject: [PATCH 35/39] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/project/entity/ProjectRxswinEO.java | 2 +- .../com/jero/modules/project/entity/ProjectRxswinEOEn.java | 2 +- .../project/service/impl/ProjectRxswinEOServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index 66c1f8cf9..b3eeef5bd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -84,7 +84,7 @@ public class ProjectRxswinEO implements Serializable { /**版本*/ @Excel(name = "版本", width = 15) - @ApiModelProperty(value = "版本") + @ApiModelProperty(value = "对应版本") private java.lang.String version; /**状态（0->保存，1->提交）*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java index 5d560ac66..bccd300b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java @@ -83,7 +83,7 @@ public class ProjectRxswinEOEn implements Serializable { private String rxswin; /**版本*/ - @Excel(name = "Corresponding version", width = 15) + @Excel(name = "Corresponding version", width = 30) @ApiModelProperty(value = "版本") private String version; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 1c78e92a8..739592327 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -428,7 +428,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); @@ -439,7 +439,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl Date: Wed, 30 Aug 2023 14:18:52 +0800 Subject: [PATCH 36/39] =?UTF-8?q?rxswin=E5=AF=BC=E5=85=A5=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFile/index.vue | 7 +++++++ .../src/views/projectManagement/components/rxswinModel.vue | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 138fe4892..58390b6dd 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -50,6 +50,10 @@ type: String, default: '' }, + version: { + type: String, + default: '' + }, paramsTemplateId: { type: String, default: '' @@ -73,6 +77,9 @@ computed: { importUrl() { if (this.projectId) { + if(this.version){ + return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId +'&version=' + this.version + } return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectId=' + this.projectId } else if (this.dummyInventoryBaseId) { return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&dummyInventoryBaseId=' + this.dummyInventoryBaseId diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index e20af5f48..3d81677fc 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -100,8 +100,9 @@
- +
Date: Wed, 30 Aug 2023 16:43:33 +0800 Subject: [PATCH 37/39] =?UTF-8?q?rxswin=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 2 +- .../controller/ProjectRxswinEOController.java | 22 +- .../modules/project/enums/RxswinEnum.java | 38 + .../service/IProjectRxswinEOService.java | 3 + .../impl/ProjectRxswinEOServiceImpl.java | 1154 ++++++++++------- 5 files changed, 748 insertions(+), 471 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RxswinEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 64ab11e5c..1ff4ec1e7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5890,7 +5890,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ProjectRxswinEO.class); + public Result importExcel(MultipartFile file,String cut,String version,String projectId) { + projectRxswinEOService.importExcel(file,cut,version,projectId); + return Result.OK(""); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RxswinEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RxswinEnum.java new file mode 100644 index 000000000..69f744bbb --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RxswinEnum.java @@ -0,0 +1,38 @@ +package com.jero.modules.project.enums; + +/** + * 当前状态枚举类 + */ +public enum RxswinEnum { + + ONE("编号","No."), + TWO("主题","Theme"), + THREE("RXSWIN","RXSWIN"), + FOUR("对应版本","Corresponding version") + ; + + + String nameCn; + String nameEn; + + private RxswinEnum(String nameCn,String nameEn) { + this.nameCn = nameCn; + this.nameEn = nameEn; + } + + public String getNameCn() { + return nameCn; + } + + public void setNameCn(String nameCn) { + this.nameCn = nameCn; + } + + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java index 3d8f87098..9e282e461 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRxswinEOService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -108,4 +109,6 @@ public interface IProjectRxswinEOService extends IService { ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO); void exportTemplate(Map map, HttpServletResponse response, HttpServletRequest request); + + void importExcel(MultipartFile file, String cut, String version, String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index 739592327..f2453664e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -15,15 +15,22 @@ import com.jero.modules.dummy.enums.OrderEnum; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRxswinEO; import com.jero.modules.project.entity.ProjectRxswinEOEn; +import com.jero.modules.project.enums.RxswinEnum; import com.jero.modules.project.enums.StatusEnum; import com.jero.modules.project.mapper.ProjectRxswinEOMapper; import com.jero.modules.project.service.IProjectRxswinEOService; +import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; @@ -32,6 +39,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -52,531 +60,755 @@ import java.util.stream.Collectors; /** * @Description: rxswin表 * @Author: jero-boot - * @Date: 2023-08-28 + * @Date: 2023-08-28 * @Version: V1.0 */ @Service public class ProjectRxswinEOServiceImpl extends ServiceImpl implements IProjectRxswinEOService { - @Autowired - private ProjectRxswinEOMapper projectRxswinEOMapper; - @Autowired - private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; - @Autowired - private ProjectLibraryBaseServiceImpl projectLibraryBaseService; - @Value(value = "${jero.path.upload}") - private String uploadpath; - /** - * 保存 - * - * @param projectRxswinEO - * @return - */ - @Override + @Autowired + private ProjectRxswinEOMapper projectRxswinEOMapper; + @Autowired + private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; + @Autowired + private ProjectLibraryBaseServiceImpl projectLibraryBaseService; + @Value(value = "${jero.path.upload}") + private String uploadpath; + + /** + * 保存 + * + * @param projectRxswinEO + * @return + */ + @Override public void add(ProjectRxswinEO projectRxswinEO) { - //判断主题是否已存在 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); - wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); - List rxswinEOList = this.list(wrapper); - if(!rxswinEOList.isEmpty()){ - throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加"); - } - Date now = new Date(); + //判断主题是否已存在 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId, projectRxswinEO.getProjectId()); + wrapper.eq(ProjectRxswinEO::getTheme, projectRxswinEO.getTheme()); + List rxswinEOList = this.list(wrapper); + if (!rxswinEOList.isEmpty()) { + throw new JeroBootException("主题：" + projectRxswinEO.getTheme() + "已存在，请重新添加"); + } + Date now = new Date(); projectRxswinEO.setCreateTime(now); projectRxswinEO.setUpdateTime(now); - projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); save(projectRxswinEO); } - /** - * 更新 - * - * @param projectRxswinEO - * @return - */ - @Override + /** + * 更新 + * + * @param projectRxswinEO + * @return + */ + @Override public void editById(ProjectRxswinEO projectRxswinEO) { - //判断主题是否存在 - LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); - wrapper.eq(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); - wrapper.ne(ProjectRxswinEO::getId,projectRxswinEO.getId()); - List rxswinEOList = this.list(wrapper); - if(!rxswinEOList.isEmpty()){ - throw new JeroBootException("主题："+projectRxswinEO.getTheme()+"已存在，请重新添加"); - } - Date now = new Date(); + //判断主题是否存在 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId, projectRxswinEO.getProjectId()); + wrapper.eq(ProjectRxswinEO::getTheme, projectRxswinEO.getTheme()); + wrapper.ne(ProjectRxswinEO::getId, projectRxswinEO.getId()); + List rxswinEOList = this.list(wrapper); + if (!rxswinEOList.isEmpty()) { + throw new JeroBootException("主题：" + projectRxswinEO.getTheme() + "已存在，请重新添加"); + } + Date now = new Date(); projectRxswinEO.setUpdateTime(now); - projectRxswinEO.setState(StatusEnum.SAVE.getValue()); - saveOrUpdate(projectRxswinEO); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + saveOrUpdate(projectRxswinEO); } - /** - * 通过id删除 - * - * @param id - * @return - */ - @Override + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override public void deleteById(String id) { removeById(id); } - /** - * 批量删除 - * - * @param ids - * @return - */ - @Override + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override public void deleteByIds(List ids) { removeByIds(ids); } - /** - * 通过id查询 - * - * @param id - * @return - */ - @Override + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override public ProjectRxswinEO queryById(String id) { return getById(id); } /** - * 列表查询 - * - * @return - */ - @Override + * 列表查询 + * + * @return + */ + @Override public List queryList() { return list(); } - @Override - public List getPageInfo(ProjectRxswinEO projectRxswinEO) { - LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); - if(StringUtils.isBlank(projectRxswinEO.getProjectId())){ - return new ArrayList<>(); - } - wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); + @Override + public List getPageInfo(ProjectRxswinEO projectRxswinEO) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isBlank(projectRxswinEO.getProjectId())) { + return new ArrayList<>(); + } + wrapper.eq(ProjectRxswinEO::getProjectId, projectRxswinEO.getProjectId()); - if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ - wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); - } - if(StringUtils.isNotBlank(projectRxswinEO.getVersion())){ - wrapper.eq(ProjectRxswinEO::getVersion,projectRxswinEO.getVersion()); - } - if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){ - wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin()); - } - if(StringUtils.isBlank(projectRxswinEO.getOrderByField())){ - wrapper.orderByDesc(ProjectRxswinEO::getCreateTime); - } - List projectRxswinEOList = this.list(wrapper); + if (StringUtils.isNotBlank(projectRxswinEO.getTheme())) { + wrapper.like(ProjectRxswinEO::getTheme, projectRxswinEO.getTheme()); + } + if (StringUtils.isNotBlank(projectRxswinEO.getVersion())) { + wrapper.eq(ProjectRxswinEO::getVersion, projectRxswinEO.getVersion()); + } + if (StringUtils.isNotBlank(projectRxswinEO.getRxswin())) { + wrapper.like(ProjectRxswinEO::getRxswin, projectRxswinEO.getRxswin()); + } + if (StringUtils.isBlank(projectRxswinEO.getOrderByField())) { + wrapper.orderByDesc(ProjectRxswinEO::getCreateTime); + } + List projectRxswinEOList = this.list(wrapper); - if(!projectRxswinEOList.isEmpty()){ - List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); - List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); - for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { - List collect = bussDocumentLibraryEOList.stream() - .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); - if(!collect.isEmpty()){ - projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); - } - } - if(StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())){ - projectRxswinEOList = projectRxswinEOList.stream() - .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); - } - heartSort(projectRxswinEO,projectRxswinEOList); - } - return projectRxswinEOList; - } + if (!projectRxswinEOList.isEmpty()) { + List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); + List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); + for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); + } + } + if (StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())) { + projectRxswinEOList = projectRxswinEOList.stream() + .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); + } + heartSort(projectRxswinEO, projectRxswinEOList); + } + return projectRxswinEOList; + } - /** - * 调取--第一层 - * @param pageNo - * @param pageSize - * @param projectRxswinEO - * @return - */ - @Override - public Page getOnePage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { - ProjectLibraryBase libraryBase = projectLibraryBaseService.getById(projectRxswinEO.getProjectId()); - String id = ""; - String parentId = ""; - if(StringUtils.isBlank(libraryBase.getParentId())){ - id = libraryBase.getId(); - parentId = libraryBase.getId(); - }else{ - id = libraryBase.getParentId(); - parentId = libraryBase.getParentId(); - } - List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(id,parentId); - for (ProjectLibraryBase projectLibraryBase : libraryBaseList) { - //项目名称 - String projectName = ""; - if(CutEnum.CN.getValue().equals(projectRxswinEO.getCut())){ - projectName = projectLibraryBase.getProjectName() + " " + projectLibraryBase.getYearName() - + "-" + projectLibraryBase.getTargetMarketNameCn() + "-" + projectLibraryBase.getProjectVersion(); - }else{ - projectName = projectLibraryBase.getProjectName() + " " + projectLibraryBase.getYearName() - + "-" + projectLibraryBase.getTargetMarketNameEn() + "-" + projectLibraryBase.getProjectVersion(); - } - projectLibraryBase.setProjectName(projectName); - } - Collections.sort(libraryBaseList); - return PageUtil.getPages(pageNo,pageSize,libraryBaseList); - } + /** + * 调取--第一层 + * + * @param pageNo + * @param pageSize + * @param projectRxswinEO + * @return + */ + @Override + public Page getOnePage(Integer pageNo, Integer pageSize, ProjectRxswinEO projectRxswinEO) { + ProjectLibraryBase libraryBase = projectLibraryBaseService.getById(projectRxswinEO.getProjectId()); + String id = ""; + String parentId = ""; + if (StringUtils.isBlank(libraryBase.getParentId())) { + id = libraryBase.getId(); + parentId = libraryBase.getId(); + } else { + id = libraryBase.getParentId(); + parentId = libraryBase.getParentId(); + } + List libraryBaseList = projectRxswinEOMapper.queryProjectLibraryBaseList(id, parentId); + for (ProjectLibraryBase projectLibraryBase : libraryBaseList) { + //项目名称 + String projectName = ""; + if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) { + projectName = projectLibraryBase.getProjectName() + " " + projectLibraryBase.getYearName() + + "-" + projectLibraryBase.getTargetMarketNameCn() + "-" + projectLibraryBase.getProjectVersion(); + } else { + projectName = projectLibraryBase.getProjectName() + " " + projectLibraryBase.getYearName() + + "-" + projectLibraryBase.getTargetMarketNameEn() + "-" + projectLibraryBase.getProjectVersion(); + } + projectLibraryBase.setProjectName(projectName); + } + Collections.sort(libraryBaseList); + return PageUtil.getPages(pageNo, pageSize, libraryBaseList); + } - /** - * 调取--第二层 - * @param pageNo - * @param pageSize - * @param projectRxswinEO - * @return - */ - @Override - public Page getTwoPage(Integer pageNo,Integer pageSize,ProjectRxswinEO projectRxswinEO) { + /** + * 调取--第二层 + * + * @param pageNo + * @param pageSize + * @param projectRxswinEO + * @return + */ + @Override + public Page getTwoPage(Integer pageNo, Integer pageSize, ProjectRxswinEO projectRxswinEO) { - LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getProjectId,projectRxswinEO.getProjectId()); - wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId, projectRxswinEO.getProjectId()); + wrapper.eq(ProjectRxswinEO::getState, StatusEnum.SUBMIT.getValue());//提交的 - if(StringUtils.isNotBlank(projectRxswinEO.getTheme())){ - wrapper.like(ProjectRxswinEO::getTheme,projectRxswinEO.getTheme()); - } - if(StringUtils.isNotBlank(projectRxswinEO.getVersion())){ - wrapper.eq(ProjectRxswinEO::getVersion,projectRxswinEO.getVersion()); - } - if(StringUtils.isNotBlank(projectRxswinEO.getRxswin())){ - wrapper.like(ProjectRxswinEO::getRxswin,projectRxswinEO.getRxswin()); - } - if(StringUtils.isBlank(projectRxswinEO.getOrderByField())){ - wrapper.orderByDesc(ProjectRxswinEO::getCreateTime); - } + if (StringUtils.isNotBlank(projectRxswinEO.getTheme())) { + wrapper.like(ProjectRxswinEO::getTheme, projectRxswinEO.getTheme()); + } + if (StringUtils.isNotBlank(projectRxswinEO.getVersion())) { + wrapper.eq(ProjectRxswinEO::getVersion, projectRxswinEO.getVersion()); + } + if (StringUtils.isNotBlank(projectRxswinEO.getRxswin())) { + wrapper.like(ProjectRxswinEO::getRxswin, projectRxswinEO.getRxswin()); + } + if (StringUtils.isBlank(projectRxswinEO.getOrderByField())) { + wrapper.orderByDesc(ProjectRxswinEO::getCreateTime); + } - List projectRxswinEOList = this.list(wrapper); + List projectRxswinEOList = this.list(wrapper); - if(!projectRxswinEOList.isEmpty()){ - List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); - List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); - for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { - List collect = bussDocumentLibraryEOList.stream() - .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); - if(!collect.isEmpty()){ - projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); - } - } - if(StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())){ - projectRxswinEOList = projectRxswinEOList.stream() - .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); - } - heartSort(projectRxswinEO,projectRxswinEOList); - } - return PageUtil.getPages(pageNo,pageSize,projectRxswinEOList); - } + if (!projectRxswinEOList.isEmpty()) { + List documentIdList = projectRxswinEOList.stream().map(ProjectRxswinEO::getDocumentId).distinct().collect(Collectors.toList()); + List bussDocumentLibraryEOList = getBussDocumentLibraryEOList(documentIdList); + for (ProjectRxswinEO projectRxswinEOTemp : projectRxswinEOList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getId().equals(projectRxswinEOTemp.getDocumentId())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + projectRxswinEOTemp.setSerialNumber(collect.get(0).getSerialNumber()); + } + } + if (StringUtils.isNotBlank(projectRxswinEO.getSerialNumber())) { + projectRxswinEOList = projectRxswinEOList.stream() + .filter(e -> e.getSerialNumber().contains(projectRxswinEO.getSerialNumber())).collect(Collectors.toList()); + } + heartSort(projectRxswinEO, projectRxswinEOList); + } + return PageUtil.getPages(pageNo, pageSize, projectRxswinEOList); + } - /** - * 提交 - * @param projectId - * @param ids - */ - @Override - public void submitInfo(String projectId, String ids) { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); - List rxswinEOList = this.list(wrapper); - for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { - projectRxswinEO.setUpdateBy(user.getUsername()); - projectRxswinEO.setState(StatusEnum.SUBMIT.getValue()); - } - this.updateBatchById(rxswinEOList); - } - /** - * 覆盖验证 - * @param projectId - * @param ids - */ - @Override - public String iSExist(String projectId, String ids) { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + /** + * 提交 + * + * @param projectId + * @param ids + */ + @Override + public void submitInfo(String projectId, String ids) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setUpdateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SUBMIT.getValue()); + } + this.updateBatchById(rxswinEOList); + } - //新增的 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + /** + * 覆盖验证 + * + * @param projectId + * @param ids + */ + @Override + public String iSExist(String projectId, String ids) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + + //新增的 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); // wrapper.eq(ProjectRxswinEO::getProjectId, projectId); - wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); - List rxswinEOList = this.list(wrapper); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); - //已存在的 - LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); - List rxswinEOS = this.list(wrapperTemp); + //已存在的 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); + List rxswinEOS = this.list(wrapperTemp); - if(!rxswinEOS.isEmpty()){ - List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); - List projectRxswinEOS = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); - if(projectRxswinEOS.isEmpty()){ - //直接新增 - saveBatchInfo(projectId, user, rxswinEOList); - }else{ - return "YES"; - } - }else{ - //直接新增 - saveBatchInfo(projectId, user, rxswinEOList); - } - return "NO"; - } + if (!rxswinEOS.isEmpty()) { + List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); + List projectRxswinEOS = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); + if (projectRxswinEOS.isEmpty()) { + //直接新增 + saveBatchInfo(projectId, user, rxswinEOList); + } else { + return "YES"; + } + } else { + //直接新增 + saveBatchInfo(projectId, user, rxswinEOList); + } + return "NO"; + } - private void saveBatchInfo(String projectId, LoginUser user, List rxswinEOList) { - for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { - projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-","")); - projectRxswinEO.setProjectId(projectId); - projectRxswinEO.setCreateTime(new Date()); - projectRxswinEO.setCreateBy(user.getUsername()); - projectRxswinEO.setState(StatusEnum.SAVE.getValue()); - } - this.saveBatch(rxswinEOList); - } + private void saveBatchInfo(String projectId, LoginUser user, List rxswinEOList) { + for (ProjectRxswinEO projectRxswinEO : rxswinEOList) { + projectRxswinEO.setId(UUID.randomUUID().toString().replaceAll("-", "")); + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setCreateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + } + this.saveBatch(rxswinEOList); + } - /** - * 调取后保存数据 - * @param projectId - * @param ids - * @param flag - */ - @Override - public void addBatch(String projectId, String ids,String flag) { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + /** + * 调取后保存数据 + * + * @param projectId + * @param ids + * @param flag + */ + @Override + public void addBatch(String projectId, String ids, String flag) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //新增的 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); - List rxswinEOList = this.list(wrapper); + //新增的 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ProjectRxswinEO::getId, Arrays.asList(ids.split(","))); + List rxswinEOList = this.list(wrapper); - //已存在的 - LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); - List rxswinEOS = this.list(wrapperTemp); + //已存在的 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.eq(ProjectRxswinEO::getProjectId, projectId); + List rxswinEOS = this.list(wrapperTemp); - List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); - List yesList = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); - List noList = rxswinEOList.stream().filter(e -> !themeList.contains(e.getTheme())).collect(Collectors.toList()); + List themeList = rxswinEOS.stream().map(ProjectRxswinEO::getTheme).collect(Collectors.toList()); + List yesList = rxswinEOList.stream().filter(e -> themeList.contains(e.getTheme())).collect(Collectors.toList()); + List noList = rxswinEOList.stream().filter(e -> !themeList.contains(e.getTheme())).collect(Collectors.toList()); - if(StatusEnum.COVER_YES.getValue().equals(flag)){ - //未存在的进行新增 - saveBatchInfo(projectId, user, noList); + if (StatusEnum.COVER_YES.getValue().equals(flag)) { + //未存在的进行新增 + saveBatchInfo(projectId, user, noList); - for (ProjectRxswinEO projectRxswinEO : yesList) { - List collect = rxswinEOS.stream() - .filter(e -> projectRxswinEO.getTheme().equals(e.getTheme())).collect(Collectors.toList()); - if(!collect.isEmpty()){ - projectRxswinEO.setId(collect.get(0).getId()); - projectRxswinEO.setCreateTime(collect.get(0).getCreateTime()); - } - projectRxswinEO.setUpdateTime(new Date()); - projectRxswinEO.setCreateBy(user.getUsername()); - projectRxswinEO.setState(StatusEnum.SAVE.getValue()); - projectRxswinEO.setProjectId(projectId); - } - //已存在的进行覆盖 - this.updateBatchById(yesList); + for (ProjectRxswinEO projectRxswinEO : yesList) { + List collect = rxswinEOS.stream() + .filter(e -> projectRxswinEO.getTheme().equals(e.getTheme())).collect(Collectors.toList()); + if (!collect.isEmpty()) { + projectRxswinEO.setId(collect.get(0).getId()); + projectRxswinEO.setCreateTime(collect.get(0).getCreateTime()); + } + projectRxswinEO.setUpdateTime(new Date()); + projectRxswinEO.setCreateBy(user.getUsername()); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + projectRxswinEO.setProjectId(projectId); + } + //已存在的进行覆盖 + this.updateBatchById(yesList); - }else if(StatusEnum.COVER_NO.getValue().equals(flag)){ - saveBatchInfo(projectId, user, noList); - } - } + } else if (StatusEnum.COVER_NO.getValue().equals(flag)) { + saveBatchInfo(projectId, user, noList); + } + } - @Override - public List getVersionList(String projectId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ProjectRxswinEO::getProjectId,projectId); - List rxswinEOList = this.list(wrapper); - List versionList = rxswinEOList.stream() - .filter(e->StringUtils.isNotBlank(e.getVersion())) - .map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); - Collections.sort(versionList,(a,b)->{ - return Integer.parseInt(a) - Integer.parseInt(b); - }); - return versionList; - } + @Override + public List getVersionList(String projectId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId, projectId); + List rxswinEOList = this.list(wrapper); + List versionList = rxswinEOList.stream() + .filter(e -> StringUtils.isNotBlank(e.getVersion())) + .map(ProjectRxswinEO::getVersion).distinct().collect(Collectors.toList()); + Collections.sort(versionList, (a, b) -> { + return Integer.parseInt(a) - Integer.parseInt(b); + }); + return versionList; + } - @Override - public ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO) { - // Step.2 获取导出数据 - List pageList = getPageInfo(projectRxswinEO); - List exportList = null; + @Override + public ModelAndView exportXls(HttpServletRequest request, ProjectRxswinEO projectRxswinEO) { + // Step.2 获取导出数据 + List pageList = getPageInfo(projectRxswinEO); + List exportList = null; - // 过滤选中数据 - String selections = request.getParameter("selections"); - if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList()); - } else { - exportList = pageList; - } + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(e -> selectionList.contains(e.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } - // Step.3 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) { - mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEO.class); - mv.addObject(NormalExcelConstants.DATA_LIST, exportList); - ExportParams exportParams = new ExportParams(null, null, "RXSWIN"); - mv.addObject(NormalExcelConstants.PARAMS, exportParams); - } else { - List dataList = new ArrayList<>(); - for (ProjectRxswinEO projectRxswinEOTemp : exportList) { - ProjectRxswinEOEn projectRxswinEOEn = new ProjectRxswinEOEn(); - BeanUtils.copyProperties(projectRxswinEOTemp, projectRxswinEOEn); - dataList.add(projectRxswinEOEn); - } - mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEOEn.class); - mv.addObject(NormalExcelConstants.DATA_LIST, dataList); - ExportParams exportParams = new ExportParams(null, null, "RXSWIN"); - mv.addObject(NormalExcelConstants.PARAMS, exportParams); - } - return mv; - } + // Step.3 AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) { + mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEO.class); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); + ExportParams exportParams = new ExportParams(null, null, "RXSWIN"); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); + } else { + List dataList = new ArrayList<>(); + for (ProjectRxswinEO projectRxswinEOTemp : exportList) { + ProjectRxswinEOEn projectRxswinEOEn = new ProjectRxswinEOEn(); + BeanUtils.copyProperties(projectRxswinEOTemp, projectRxswinEOEn); + dataList.add(projectRxswinEOEn); + } + mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEOEn.class); + mv.addObject(NormalExcelConstants.DATA_LIST, dataList); + ExportParams exportParams = new ExportParams(null, null, "RXSWIN"); + mv.addObject(NormalExcelConstants.PARAMS, exportParams); + } + return mv; + } - public List getBussDocumentLibraryEOList(List documentIdList){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(BussDocumentLibraryEO::getId,documentIdList); - return bussDocumentLibraryEOService.list(wrapper); - } + public List getBussDocumentLibraryEOList(List documentIdList) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, documentIdList); + return bussDocumentLibraryEOService.list(wrapper); + } - private void heartSort(ProjectRxswinEO projectRxswinEO, List projectRxswinEOList) { - Collator comparator = Collator.getInstance(Locale.CHINESE); - // 编号 - if ("serialNumber".equals(projectRxswinEO.getOrderByField())) { - if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; - String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; - return comparator.compare(e1PlannedBpLaunchBatch, e2PlannedBpLaunchBatch); - }); - } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; - String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; - return comparator.compare(e2PlannedBpLaunchBatch, e1PlannedBpLaunchBatch); - }); - } - } - // 主题 - if ("theme".equals(projectRxswinEO.getOrderByField())) { - if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; - String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; - return comparator.compare(e1Market, e2Market); - }); - } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; - String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; - return comparator.compare(e2Market, e1Market); - }); - } - } - //RXSWIN - if ("rxswin".equals(projectRxswinEO.getOrderByField())) { - if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; - String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; - return comparator.compare(e1Market, e2Market); - }); - } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; - String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; - return comparator.compare(e2Market, e1Market); - }); - } - } + private void heartSort(ProjectRxswinEO projectRxswinEO, List projectRxswinEOList) { + Collator comparator = Collator.getInstance(Locale.CHINESE); + // 编号 + if ("serialNumber".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; + String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; + return comparator.compare(e1PlannedBpLaunchBatch, e2PlannedBpLaunchBatch); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getSerialNumber()) ? e1.getSerialNumber() : ""; + String e2PlannedBpLaunchBatch = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getSerialNumber()) ? e2.getSerialNumber() : ""; + return comparator.compare(e2PlannedBpLaunchBatch, e1PlannedBpLaunchBatch); + }); + } + } + // 主题 + if ("theme".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getTheme()) ? e1.getTheme() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getTheme()) ? e2.getTheme() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + //RXSWIN + if ("rxswin".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getRxswin()) ? e1.getRxswin() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getRxswin()) ? e2.getRxswin() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } - //对应版本 - if ("version".equals(projectRxswinEO.getOrderByField())) { - if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; - String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; - return comparator.compare(e1Market, e2Market); - }); - } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { - Collections.sort(projectRxswinEOList, (e1, e2) -> { - String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; - String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; - return comparator.compare(e2Market, e1Market); - }); - } - } - } + //对应版本 + if ("version".equals(projectRxswinEO.getOrderByField())) { + if (OrderEnum.POSITIVE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; + return comparator.compare(e1Market, e2Market); + }); + } else if (OrderEnum.REVERSE.getValue().equals(projectRxswinEO.getOrderBy())) { + Collections.sort(projectRxswinEOList, (e1, e2) -> { + String e1Market = com.jero.modules.system.util.StringUtils.isNotBlank(e1.getVersion()) ? e1.getVersion() : ""; + String e2Market = com.jero.modules.system.util.StringUtils.isNotBlank(e2.getVersion()) ? e2.getVersion() : ""; + return comparator.compare(e2Market, e1Market); + }); + } + } + } - @Override - public void exportTemplate(Map map, HttpServletResponse response, HttpServletRequest request) { - OutputStream os = null; - HSSFWorkbook workbook = new HSSFWorkbook(); - String cut = (String) map.get("cut"); - String sheetName = ""; - if(com.jero.modules.system.util.StringUtils.equals(cut,CutEnum.CN.getValue())){ - sheetName = "RXSWIN"; - }else { - sheetName = "RXSWIN"; - } - String fileOriName = "文档库导入模板.xls"; - String filePath = uploadpath + File.separator + fileOriName; - try { - List list = new ArrayList<>(); - if(CutEnum.CN.getValue().equals((String) map.get("cut"))){ - list.add("编号,主题,RXSWIN,对应版本"); - }else{ - list.add("No.,Theme,RXSWIN,Corresponding version"); - } - //创建临时文件夹 - File nowFile = new File(filePath); - if (nowFile.exists()) { - nowFile.delete(); - } - nowFile.mkdirs(); - HSSFSheet sheet = workbook.createSheet(sheetName); - sheet.setDefaultColumnWidth(16);//列宽 - HSSFCellStyle cellStyle = workbook.createCellStyle(); - cellStyle.setWrapText(true);//自动换行 - cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + @Override + public void exportTemplate(Map map, HttpServletResponse response, HttpServletRequest request) { + OutputStream os = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + String cut = (String) map.get("cut"); + String sheetName = ""; + if (com.jero.modules.system.util.StringUtils.equals(cut, CutEnum.CN.getValue())) { + sheetName = "RXSWIN"; + } else { + sheetName = "RXSWIN"; + } + String fileOriName = "文档库导入模板.xls"; + String filePath = uploadpath + File.separator + fileOriName; + try { + List list = new ArrayList<>(); + if (CutEnum.CN.getValue().equals((String) map.get("cut"))) { + list.add("编号,主题,RXSWIN,对应版本"); + } else { + list.add("No.,Theme,RXSWIN,Corresponding version"); + } + //创建临时文件夹 + File nowFile = new File(filePath); + if (nowFile.exists()) { + nowFile.delete(); + } + nowFile.mkdirs(); + HSSFSheet sheet = workbook.createSheet(sheetName); + sheet.setDefaultColumnWidth(16);//列宽 + HSSFCellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setWrapText(true);//自动换行 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER); - for (int i = 0; i < 1; i++) { - //表头 - Row row = sheet.createRow(i);//开始创建标题行 - String exportFieldName = list.get(i); - if (i == 0) { - if (com.jero.modules.system.util.StringUtils.isNotBlank(exportFieldName)) { - String[] headerArr = exportFieldName.split(","); - for (int j = 0; j < headerArr.length; j++) { - row.createCell(j).setCellValue(headerArr[j]); - } - } - } - } - response.setHeader("Content-Disposition", - "attachment; filename=\"" + fileOriName + ".xls"); - response.setContentType("application/force-download"); - response.flushBuffer(); - os = response.getOutputStream(); - workbook.write(os); - } catch (Exception e) { - throw new JeroBootException("下载文件失败，请重试"); - } finally { - IOUtils.closeQuietly(os); - } + for (int i = 0; i < 1; i++) { + //表头 + Row row = sheet.createRow(i);//开始创建标题行 + String exportFieldName = list.get(i); + if (i == 0) { + if (com.jero.modules.system.util.StringUtils.isNotBlank(exportFieldName)) { + String[] headerArr = exportFieldName.split(","); + for (int j = 0; j < headerArr.length; j++) { + row.createCell(j).setCellValue(headerArr[j]); + } + } + } + } + response.setHeader("Content-Disposition", + "attachment; filename=\"" + fileOriName + ".xls"); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(os); + } catch (Exception e) { + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); + } - } + } + + @SneakyThrows + @Override + public void importExcel(MultipartFile file, String cut, String version, String projectId) { + String title = ""; + if (CutEnum.CN.getValue().equals(cut)) { + title = "编号,主题,RXSWIN,对应版本"; + } else { + title = "No.,Theme,RXSWIN,Corresponding version"; + } + // 获取文件名 + String fileName = file.getOriginalFilename(); + // 获取文件后缀 + String prefix = fileName.substring(fileName.lastIndexOf(".")); + if (!(prefix.equals(".xls") || prefix.equals(".xlsx"))) { + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("文件格式错误,请导入.xls或.xlsx格式"); + } else { + throw new JeroBootException("The file format is wrong, please import. xls or. xlsx format."); + } + } + Workbook workbook = null; + try { + File excelFile = File.createTempFile(fileName, prefix); + file.transferTo(excelFile); + workbook = WorkbookFactory.create(excelFile); + } catch (Exception e) { + e.printStackTrace(); + } + List projectRxswinEOList = new ArrayList<>(); + if (workbook != null) { + Sheet sheet = workbook.getSheetAt(0); + if (sheet != null) { + StringBuilder headerSb = new StringBuilder(); + int rowNos = sheet.getLastRowNum();// 得到excel的总记录条数 + for (int i = 0; i <= rowNos; i++) { + Row row = sheet.getRow(i); + Row headerRow = sheet.getRow(0); + boolean isBlank = bussDocumentLibraryEOService.isRowEmpty(row); + ProjectRxswinEO projectRxswinEO = new ProjectRxswinEO(); + if (row != null && !isBlank) { + int columNos = headerRow.getLastCellNum();// 表头总共的列数 + for (int j = 0; j < columNos; j++) { + Cell cell = row.getCell(j); + Cell headerCell = headerRow.getCell(j); + if (cell != null) { + if (i == 0) { + cell.setCellType(HSSFCell.CELL_TYPE_STRING); + headerSb.append(cell.getStringCellValue() + ","); + } else { + cell.setCellType(HSSFCell.CELL_TYPE_STRING); + String stringCellValue = cell.getStringCellValue(); + if (StringUtils.isNotBlank(stringCellValue)) { + String replace = stringCellValue.replace("，", ","); + rxswinEOSet(projectRxswinEO, headerCell, replace); + } else { + rxswinEOSet(projectRxswinEO, headerCell, ""); + } + } + } else { + if (i != 0) { + rxswinEOSet(projectRxswinEO, headerCell, ""); + } + } + } + if (i != 0) { + projectRxswinEOList.add(projectRxswinEO); +// dataList.add(rowList); + } + } + } + String substring = headerSb.toString(); + if (substring.endsWith(",") || substring.endsWith("，")) { + substring = headerSb.substring(0, headerSb.length() - 1); + } + String excelHeader = substring.toString(); + if (!title.equals(excelHeader)) { + workbook.close(); + //删除原上传文件 + if (CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("读取失败，请严格按照模板文件导入数据"); + } else { + throw new JeroBootException("The data fails to be read. Import data strictly according to the template file"); + } + } + } + } + List libraryEOList = bussDocumentLibraryEOService.list(); + List serialNumberList = libraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + + List msgList = new ArrayList<>(); + //数据验证 + dataVerify(cut, projectId, projectRxswinEOList, serialNumberList, msgList); + + if (msgList.size() > 0) { + //返回报错信息 + String html = ""; + for (String s : msgList) { + html += s + "
"; + } + throw new JeroBootException(html); + } else { + for (ProjectRxswinEO projectRxswinEO : projectRxswinEOList) { + projectRxswinEO.setProjectId(projectId); + projectRxswinEO.setState(StatusEnum.SAVE.getValue()); + List collect = libraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(projectRxswinEO.getSerialNumber())) + .collect(Collectors.toList()); + if (!collect.isEmpty()) { + projectRxswinEO.setDocumentId(collect.get(0).getId()); + } + } + this.saveBatch(projectRxswinEOList); + } + + + } + + private void dataVerify(String cut, String projectId, List projectRxswinEOList, List serialNumberList, List msgList) { + int count = 2; + for (ProjectRxswinEO projectRxswinEO : projectRxswinEOList) { + int countError = 0; + StringBuilder errorMsg = new StringBuilder(); + if (CutEnum.CN.getValue().equals(cut)) { + errorMsg.append("第" + count + "行："); +// errorMsg = "第" + count + "行："; + } else { + errorMsg.append(count + " line："); +// errorMsg = count + " line："; + } + String serialNumber = projectRxswinEO.getSerialNumber(); + String theme = projectRxswinEO.getTheme(); + String rxswin = projectRxswinEO.getRxswin(); + String versionTemp = projectRxswinEO.getVersion(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProjectRxswinEO::getProjectId, projectId); + wrapper.eq(ProjectRxswinEO::getTheme, theme); + List rxswinEOList = this.list(wrapper); + if (CutEnum.CN.getValue().equals(cut)) { + countError = isMust(errorMsg, RxswinEnum.ONE.getNameCn(), serialNumber, "不能为空，", countError); + //验证编号是否存在 + if (StringUtils.isNotBlank(serialNumber) && !serialNumberList.contains(serialNumber)) { + errorMsg.append(RxswinEnum.ONE.getNameCn() + "不存在，"); +// errorMsg += RxswinEnum.ONE.getNameCn()+"不存在，"; + countError++; + } + + countError = isMust(errorMsg, RxswinEnum.TWO.getNameCn(), theme, "不能为空，", countError); + //验证主题是否存在 + if (!rxswinEOList.isEmpty()) { + errorMsg.append(RxswinEnum.TWO.getNameCn() + "已存在，"); +// errorMsg += RxswinEnum.TWO.getNameCn()+"已存在，"; + countError++; + } + + countError = isMust(errorMsg, RxswinEnum.THREE.getNameCn(), rxswin, "不能为空，", countError); + countError = isMust(errorMsg, RxswinEnum.FOUR.getNameCn(), versionTemp, "不能为空，", countError); + } else { + countError = isMust(errorMsg, RxswinEnum.ONE.getNameEn(), serialNumber, " cannot be empty，", countError); + //验证编号是否存在 + if (StringUtils.isNotBlank(serialNumber) && !serialNumberList.contains(serialNumber)) { + errorMsg.append(RxswinEnum.ONE.getNameEn() + " absent，"); +// errorMsg += RxswinEnum.ONE.getNameEn()+" absent，"; + countError++; + } + + countError = isMust(errorMsg, RxswinEnum.TWO.getNameEn(), theme, " cannot be empty，", countError); + //验证主题是否存在 + if (!rxswinEOList.isEmpty()) { + errorMsg.append(RxswinEnum.TWO.getNameCn() + " already exists，"); +// errorMsg += RxswinEnum.TWO.getNameCn()+" already exists，"; + countError++; + } + + countError = isMust(errorMsg, RxswinEnum.THREE.getNameEn(), rxswin, " cannot be empty，", countError); + countError = isMust(errorMsg, RxswinEnum.FOUR.getNameEn(), versionTemp, " cannot be empty，", countError); + } + if (countError > 0) { + if (errorMsg.toString().endsWith("，")) { + String substring = errorMsg.substring(0, errorMsg.length() - 1); + msgList.add(substring); + } else { + msgList.add(errorMsg.toString()); + } + } + count++; + } + } + + private int isMust(StringBuilder errorMsg, String field, String value, String reminder, int countError) { + if (StringUtils.isBlank(value)) { + errorMsg.append(field + reminder); +// errorMsg += field + reminder; + countError++; + } + return countError; + } + + + private void rxswinEOSet(ProjectRxswinEO projectRxswinEO, Cell headerCell, String replace) { + if (RxswinEnum.ONE.getNameCn().equals(headerCell.getStringCellValue()) + || RxswinEnum.ONE.getNameEn().equals(headerCell.getStringCellValue())) { + projectRxswinEO.setSerialNumber(replace); + + } else if (RxswinEnum.TWO.getNameCn().equals(headerCell.getStringCellValue()) + || RxswinEnum.TWO.getNameEn().equals(headerCell.getStringCellValue())) { + projectRxswinEO.setTheme(replace); + + } else if (RxswinEnum.THREE.getNameCn().equals(headerCell.getStringCellValue()) + || RxswinEnum.THREE.getNameEn().equals(headerCell.getStringCellValue())) { + projectRxswinEO.setRxswin(replace); + + } else if (RxswinEnum.FOUR.getNameCn().equals(headerCell.getStringCellValue()) + || RxswinEnum.FOUR.getNameEn().equals(headerCell.getStringCellValue())) { + projectRxswinEO.setVersion(replace); + } + } } From e8a743b1be3d6c17c3433535e051736b6c3df9eb Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 30 Aug 2023 17:58:33 +0800 Subject: [PATCH 38/39] =?UTF-8?q?rxswin=E5=AF=BC=E5=85=A5=E9=AA=8C?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectRxswinEO.java | 4 +++ .../impl/ProjectRxswinEOServiceImpl.java | 32 ++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java index b3eeef5bd..f11e37d89 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java @@ -105,4 +105,8 @@ public class ProjectRxswinEO implements Serializable { @ApiModelProperty(value = "排序") private java.lang.String orderBy; + @TableField(exist = false) + @ApiModelProperty(value = "行号") + private java.lang.Integer number; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java index f2453664e..0d27f9d67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java @@ -713,17 +713,41 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl projectRxswinEOList, List serialNumberList, List msgList) { + List projectRxswinEOListTemp = projectRxswinEOList; + int number = 2; + int numberTemp = 2; + for (ProjectRxswinEO rxswinEO : projectRxswinEOListTemp) { + rxswinEO.setNumber(number); + number++; + } + for (ProjectRxswinEO projectRxswinEO : projectRxswinEOList) { + projectRxswinEO.setNumber(numberTemp); + numberTemp++; + } int count = 2; for (ProjectRxswinEO projectRxswinEO : projectRxswinEOList) { - int countError = 0; StringBuilder errorMsg = new StringBuilder(); if (CutEnum.CN.getValue().equals(cut)) { errorMsg.append("第" + count + "行："); -// errorMsg = "第" + count + "行："; } else { errorMsg.append(count + " line："); -// errorMsg = count + " line："; } + int countError = 0; + List rxswinEOS = projectRxswinEOListTemp.stream() + .filter(e -> !e.getNumber().equals(projectRxswinEO.getNumber()) && e.getTheme().equals(projectRxswinEO.getTheme())) + .collect(Collectors.toList()); + if(!rxswinEOS.isEmpty()){ + List numberList = rxswinEOS.stream().map(ProjectRxswinEO::getNumber).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg.append(RxswinEnum.TWO.getNameCn()+"与"+StringUtils.join(numberList,",")+"行主题重复，"); + }else{ + errorMsg.append(RxswinEnum.TWO.getNameEn()+" and "+StringUtils.join(numberList,",")+" are duplicated，"); + } + + countError ++; + } + projectRxswinEOListTemp = projectRxswinEOListTemp.stream().filter(e->!e.getTheme().equals(projectRxswinEO.getTheme())).collect(Collectors.toList()); + String serialNumber = projectRxswinEO.getSerialNumber(); String theme = projectRxswinEO.getTheme(); String rxswin = projectRxswinEO.getRxswin(); @@ -763,7 +787,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl Date: Fri, 1 Sep 2023 17:30:03 +0800 Subject: [PATCH 39/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/certificationList/index.vue | 69 ++++++++++--------- .../components/rxswinModel.vue | 1 - 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 62c423b60..9ea6add73 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -12,17 +12,6 @@ v-model="queryParam.inspectionItem">
- -
-
- {{ $t('areaOfResponsibility') }} -
- -
-
@@ -44,7 +33,41 @@
+ +
+
+ {{ $t('statisticalNodes') }} +
+ + + + {{ item.key }} + + + +
+ diff --git a/jero-web/src/views/projectManagement/components/rxswinModel.vue b/jero-web/src/views/projectManagement/components/rxswinModel.vue index 3d81677fc..6b27c2f8e 100644 --- a/jero-web/src/views/projectManagement/components/rxswinModel.vue +++ b/jero-web/src/views/projectManagement/components/rxswinModel.vue @@ -295,7 +295,6 @@ title: this.$t('operation'), align: 'left', width: 110, - fixed: 'right', scopedSlots: { customRender: 'operation' } } ],