From 5bd2666b38cac9d126f9bfc0dd69b18215a9d2b9 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 20 May 2022 15:10:59 +0800 Subject: [PATCH 01/13] =?UTF-8?q?space=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectNameInfoEOController.java | 14 +- .../ProjectYearNameInfoEOController.java | 170 +++++++ .../project/entity/ProjectLibraryBase.java | 2 - .../project/entity/ProjectNameInfoEO.java | 15 +- .../project/entity/ProjectYearNameInfoEO.java | 74 +++ .../mapper/ProjectNameInfoEOMapper.java | 13 +- .../mapper/ProjectYearNameInfoEOMapper.java | 13 + .../mapper/xml/ProjectNameInfoEOMapper.xml | 2 + .../xml/ProjectYearNameInfoEOMapper.xml | 14 + .../service/IProjectNameInfoEOService.java | 4 +- .../IProjectYearNameInfoEOService.java | 61 +++ .../impl/ProjectNameInfoEOServiceImpl.java | 425 ++++++++++-------- .../ProjectYearNameInfoEOServiceImpl.java | 90 ++++ .../space/service/SpaceServiceImpl.java | 10 +- .../src/main/resources/application-dev.yml | 62 +-- 15 files changed, 732 insertions(+), 237 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectYearNameInfoEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectYearNameInfoEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectYearNameInfoEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectYearNameInfoEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectYearNameInfoEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectYearNameInfoEOServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java index 26911c24f..ad8e36248 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java @@ -9,6 +9,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.service.IProjectNameInfoEOService; +import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -23,7 +24,7 @@ import java.util.Arrays; import java.util.List; - /** +/** * @Description: 项目名信息表 * @Author: jero-boot * @Date: 2022-04-18 @@ -68,8 +69,13 @@ public class ProjectNameInfoEOController extends JeroController> queryList() { - List list = projectNameInfoEOService.queryList(); - return Result.OK(list); + List list = projectNameInfoEOService.queryList(); + for(ProjectNameInfoEO projectNameInfoEO : list){ + if(StringUtils.isNotBlank(projectNameInfoEO.getYearName())){ + projectNameInfoEO.setProjectName(projectNameInfoEO.getProjectName()+ "-" +projectNameInfoEO.getYearName()); + } + } + return Result.OK(list); } /** @@ -177,6 +183,6 @@ public class ProjectNameInfoEOController extends JeroController { + @Autowired + private IProjectYearNameInfoEOService projectYearNameInfoEOService; + + /** + * 分页列表查询 + * + * @param projectYearNameInfoEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目库-项目名年号表-分页列表查询") + @ApiOperation(value="项目库-项目名年号表-分页列表查询", notes="项目库-项目名年号表-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(ProjectYearNameInfoEO projectYearNameInfoEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectYearNameInfoEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = projectYearNameInfoEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * + * @return + */ + @AutoLog(value = "项目库-项目名年号表-列表查询") + @ApiOperation(value="项目库-项目名年号表-列表查询", notes="项目库-项目名年号表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { + List list = projectYearNameInfoEOService.queryList(); + return Result.OK(list); + } + + /** + * 添加 + * + * @param projectYearNameInfoEO + * @return + */ + @AutoLog(value = "项目库-项目名年号表-添加") + @ApiOperation(value="项目库-项目名年号表-添加", notes="项目库-项目名年号表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody ProjectYearNameInfoEO projectYearNameInfoEO) { + projectYearNameInfoEOService.add(projectYearNameInfoEO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param projectYearNameInfoEO + * @return + */ + @AutoLog(value = "项目库-项目名年号表-编辑") + @ApiOperation(value="项目库-项目名年号表-编辑", notes="项目库-项目名年号表-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody ProjectYearNameInfoEO projectYearNameInfoEO) { + projectYearNameInfoEOService.editById(projectYearNameInfoEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-项目名年号表-通过id删除") + @ApiOperation(value="项目库-项目名年号表-通过id删除", notes="项目库-项目名年号表-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + projectYearNameInfoEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "项目库-项目名年号表-批量删除") + @ApiOperation(value="项目库-项目名年号表-批量删除", notes="项目库-项目名年号表-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.projectYearNameInfoEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "项目库-项目名年号表-通过id查询") + @ApiOperation(value="项目库-项目名年号表-通过id查询", notes="项目库-项目名年号表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + ProjectYearNameInfoEO projectYearNameInfoEO = projectYearNameInfoEOService.queryById(id); + if(projectYearNameInfoEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(projectYearNameInfoEO); + } + + /** + * 导出excel + * + * @param request + * @param projectYearNameInfoEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, ProjectYearNameInfoEO projectYearNameInfoEO) { + return super.exportXls(request, projectYearNameInfoEO, ProjectYearNameInfoEO.class, "项目库-项目名年号表"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, ProjectYearNameInfoEO.class); + } + +} 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 f0ca0a949..50d39037d 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 @@ -56,11 +56,9 @@ public class ProjectLibraryBase implements Serializable { private java.lang.String certificationEngineerName; /**车型平台*/ - @Dict(dicCode = "vehicle_platform") private java.lang.String vehiclePlatform; /**数字平台*/ - @Dict(dicCode = "digital_platform") private java.lang.String digitalPlatform; /**IPD信息*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java index fe0b4c06f..75a9193b8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectNameInfoEO.java @@ -1,7 +1,6 @@ package com.jero.modules.project.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -30,7 +29,7 @@ public class ProjectNameInfoEO implements Serializable { private static final long serialVersionUID = 1L; /**主键*/ - @TableId(type = IdType.ASSIGN_ID) +// @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "主键") private java.lang.String id; @@ -64,8 +63,16 @@ public class ProjectNameInfoEO implements Serializable { private java.lang.String projectName; /**年款名称*/ - @Excel(name = "年款名称", width = 15) @ApiModelProperty(value = "年款名称") + @TableField(exist = false) private java.lang.String yearName; + /**车型平台*/ + @ApiModelProperty(value = "车型平台") + private java.lang.String vehiclePlatform; + + /**数字平台*/ + @ApiModelProperty(value = "车型平台") + private java.lang.String digitalPlatform; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectYearNameInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectYearNameInfoEO.java new file mode 100644 index 000000000..7de546a6f --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectYearNameInfoEO.java @@ -0,0 +1,74 @@ +package com.jero.modules.project.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 项目库-项目名年号表 + * @Author: jero-boot + * @Date: 2022-05-20 + * @Version: V1.0 + */ +@Data +@TableName("project_year_name_info") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_year_name_info对象", description="项目库-项目名年号表") +public class ProjectYearNameInfoEO 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*/ + @Excel(name = "项目名id", width = 15) + @ApiModelProperty(value = "项目名id") + private String projectNameId; + + /**年款名称*/ + @Excel(name = "年款名称", width = 15) + @ApiModelProperty(value = "年款名称") + private String yearName; + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java index 481499c7e..42730de8a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java @@ -1,10 +1,10 @@ package com.jero.modules.project.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.project.entity.ProjectNameInfoEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.project.entity.ProjectNameInfoEO; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @Description: 项目名信息表 @@ -13,5 +13,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Version: V1.0 */ public interface ProjectNameInfoEOMapper extends BaseMapper { - + @Select("select pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + + "from project_name_info as pni\n" + + "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;") + List selectProjectNameAndYear(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectYearNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectYearNameInfoEOMapper.java new file mode 100644 index 000000000..40e7f9e54 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectYearNameInfoEOMapper.java @@ -0,0 +1,13 @@ +package com.jero.modules.project.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; + +/** + * @Description: 项目库-项目名年号表 + * @Author: jero-boot + * @Date: 2022-05-20 + * @Version: V1.0 + */ +public interface ProjectYearNameInfoEOMapper extends BaseMapper { +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectNameInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectNameInfoEOMapper.xml index f5e8e5148..19e4e7b2a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectNameInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectNameInfoEOMapper.xml @@ -9,5 +9,7 @@ + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectYearNameInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectYearNameInfoEOMapper.xml new file mode 100644 index 000000000..85fc5d018 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectYearNameInfoEOMapper.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java index ad3fbdf83..515b0554e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectNameInfoEOService.java @@ -59,5 +59,7 @@ public interface IProjectNameInfoEOService extends IService { */ List queryList(); - String getYapiInfo(); + + + String getSpaceInfo(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectYearNameInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectYearNameInfoEOService.java new file mode 100644 index 000000000..83017e4d0 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectYearNameInfoEOService.java @@ -0,0 +1,61 @@ +package com.jero.modules.project.service; + +import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + +/** + * @Description: 项目库-项目名年号表 + * @Author: jero-boot + * @Date: 2022-05-20 + * @Version: V1.0 + */ +public interface IProjectYearNameInfoEOService extends IService { + + /** + * 保存 + * + * @param projectYearNameInfoEO + * @return + */ + void add(ProjectYearNameInfoEO projectYearNameInfoEO); + + /** + * 更新 + * + * @param projectYearNameInfoEO + * @return + */ + void editById(ProjectYearNameInfoEO projectYearNameInfoEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + ProjectYearNameInfoEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java index d361c8985..ee7da8ae2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java @@ -1,7 +1,11 @@ package com.jero.modules.project.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.project.entity.ProjectNameInfoEO; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.service.IProjectNameInfoEOService; import com.jero.modules.space.service.SpaceServiceImpl; @@ -10,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.Date; import java.util.List; +import java.util.UUID; /** * @Description: 项目名信息表 @@ -19,8 +24,14 @@ import java.util.List; */ @Service public class ProjectNameInfoEOServiceImpl extends ServiceImpl implements IProjectNameInfoEOService { -@Autowired -private SpaceServiceImpl spaceService; + @Autowired + private ProjectNameInfoEOMapper prjectNameMapper; + + @Autowired + private SpaceServiceImpl spaceService; + + @Autowired + private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService; /** * 保存 * @@ -28,12 +39,12 @@ private SpaceServiceImpl spaceService; * @return */ @Override - public void add(ProjectNameInfoEO projectNameInfoEO) { - Date now = new Date(); - projectNameInfoEO.setCreateTime(now); - projectNameInfoEO.setUpdateTime(now); - save(projectNameInfoEO); - } + public void add(ProjectNameInfoEO projectNameInfoEO) { + Date now = new Date(); + projectNameInfoEO.setCreateTime(now); + projectNameInfoEO.setUpdateTime(now); + save(projectNameInfoEO); + } /** * 更新 @@ -42,11 +53,11 @@ private SpaceServiceImpl spaceService; * @return */ @Override - public void editById(ProjectNameInfoEO projectNameInfoEO) { - Date now = new Date(); - projectNameInfoEO.setUpdateTime(now); - saveOrUpdate(projectNameInfoEO); - } + public void editById(ProjectNameInfoEO projectNameInfoEO) { + Date now = new Date(); + projectNameInfoEO.setUpdateTime(now); + saveOrUpdate(projectNameInfoEO); + } /** * 通过id删除 @@ -55,9 +66,9 @@ private SpaceServiceImpl spaceService; * @return */ @Override - public void deleteById(String id) { - removeById(id); - } + public void deleteById(String id) { + removeById(id); + } /** * 批量删除 @@ -66,9 +77,9 @@ private SpaceServiceImpl spaceService; * @return */ @Override - public void deleteByIds(List ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** * 通过id查询 @@ -77,188 +88,224 @@ private SpaceServiceImpl spaceService; * @return */ @Override - public ProjectNameInfoEO queryById(String id) { - return getById(id); - } + public ProjectNameInfoEO queryById(String id) { + return getById(id); + } - /** + /** * 列表查询 * * @return */ @Override - public List queryList() { - return list(); - } -@Override - public String getYapiInfo(){ + public List queryList() { + List projectNameAndYear = prjectNameMapper.selectProjectNameAndYear(); + return projectNameAndYear; + } + + @Override + public String getSpaceInfo(){ String sign =""; try { -// sign = spaceService.getSign(); +// sign = spaceService.getSign(); - String resultData = "{\n" + - " \"resultData\": [\n" + - " {\n" + - " \"modelCode\": \"ES8_00\",\n" + - " \"modelName\": \"ES8\",\n" + - " \"hardwarePltCode\": \"mhp_npa\",\n" + - " \"hardwarePltName\": \"NPA\",\n" + - " \"softwarePltCode\": \"msp_nt1\",\n" + - " \"softwarePltName\": \"NT1\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.2\",\n" + - " \"yearName\": \"G1.2\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.3\",\n" + - " \"yearName\": \"G1.3\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f\",\n" + - " \"yearName\": \"G1.F\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f.e\",\n" + - " \"yearName\": \"G1.F.E\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_my2018\",\n" + - " \"yearName\": \"MY2018\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.5\",\n" + - " \"yearName\": \"G1.5\"\n" + - " }\n" + - " ]\n" + - " }，\n" + - " {\n" + - " \"modelCode\": \"FURY_00\",\n" + - " \"modelName\": \"FURY\",\n" + - " \"hardwarePltCode\": \"mhp_npa\",\n" + - " \"hardwarePltName\": \"NPA\",\n" + - " \"softwarePltCode\": \"msp_nt1\",\n" + - " \"softwarePltName\": \"NT1\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.2\",\n" + - " \"yearName\": \"G1.2\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.3\",\n" + - " \"yearName\": \"G1.3\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f\",\n" + - " \"yearName\": \"G1.F\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.6\",\n" + - " \"yearName\": \"G1.6\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.5\",\n" + - " \"yearName\": \"G1.5\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"FORCE_00\",\n" + - " \"modelName\": \"FORCE\",\n" + - " \"hardwarePltCode\": \"mhp_npb\",\n" + - " \"hardwarePltName\": \"NPB\",\n" + - " \"softwarePltCode\": \"msp_nt2\",\n" + - " \"softwarePltName\": \"NT2\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.2\",\n" + - " \"yearName\": \"G1.2\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.3\",\n" + - " \"yearName\": \"G1.3\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f\",\n" + - " \"yearName\": \"G1.F\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.6\",\n" + - " \"yearName\": \"G1.6\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.5\",\n" + - " \"yearName\": \"G1.5\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"Gemini_00\",\n" + - " \"modelName\": \"Gemini\",\n" + - " \"hardwarePltCode\": \"mhp_npa\",\n" + - " \"hardwarePltName\": \"NPA\",\n" + - " \"softwarePltCode\": \"msp_nt2\",\n" + - " \"softwarePltName\": \"NT2\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"Pegasus_00\",\n" + - " \"modelName\": \"Pegasus\",\n" + - " \"hardwarePltCode\": \"mhp_npc\",\n" + - " \"hardwarePltName\": \"NPC\",\n" + - " \"softwarePltCode\": \"msp_nt2\",\n" + - " \"softwarePltName\": \"NT2\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_G1.1.RH\",\n" + - " \"yearName\": \"G1.1.RH\"\n" + - " }\n" + - " ]\n" + - " }\n" + - " ],\n" + - " \"resultCode\": \"WL-0000\",\n" + - " \"resultDesc\": \"Success\"\n" + - "}"; + String jsonData = "{\n" + + " \"resultData\": [\n" + + " {\n" + + " \"modelCode\": \"ES8_00\",\n" + + " \"modelName\": \"ES8\",\n" + + " \"hardwarePltCode\": \"mhp_npa\",\n" + + " \"hardwarePltName\": \"NPA\",\n" + + " \"softwarePltCode\": \"msp_nt1\",\n" + + " \"softwarePltName\": \"NT1\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.2\",\n" + + " \"yearName\": \"G1.2\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.3\",\n" + + " \"yearName\": \"G1.3\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f\",\n" + + " \"yearName\": \"G1.F\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f.e\",\n" + + " \"yearName\": \"G1.F.E\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_my2018\",\n" + + " \"yearName\": \"MY2018\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.5\",\n" + + " \"yearName\": \"G1.5\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"FURY_00\",\n" + + " \"modelName\": \"FURY\",\n" + + " \"hardwarePltCode\": \"mhp_npa\",\n" + + " \"hardwarePltName\": \"NPA\",\n" + + " \"softwarePltCode\": \"msp_nt1\",\n" + + " \"softwarePltName\": \"NT1\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.2\",\n" + + " \"yearName\": \"G1.2\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.3\",\n" + + " \"yearName\": \"G1.3\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f\",\n" + + " \"yearName\": \"G1.F\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.6\",\n" + + " \"yearName\": \"G1.6\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.5\",\n" + + " \"yearName\": \"G1.5\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"FORCE_00\",\n" + + " \"modelName\": \"FORCE\",\n" + + " \"hardwarePltCode\": \"mhp_npb\",\n" + + " \"hardwarePltName\": \"NPB\",\n" + + " \"softwarePltCode\": \"msp_nt2\",\n" + + " \"softwarePltName\": \"NT2\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.2\",\n" + + " \"yearName\": \"G1.2\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.3\",\n" + + " \"yearName\": \"G1.3\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.f\",\n" + + " \"yearName\": \"G1.F\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.6\",\n" + + " \"yearName\": \"G1.6\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.5\",\n" + + " \"yearName\": \"G1.5\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"Gemini_00\",\n" + + " \"modelName\": \"Gemini\",\n" + + " \"hardwarePltCode\": \"mhp_npa\",\n" + + " \"hardwarePltName\": \"NPA\",\n" + + " \"softwarePltCode\": \"msp_nt2\",\n" + + " \"softwarePltName\": \"NT2\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " }\n" + + " ]\n" + + " },\n" + + " {\n" + + " \"modelCode\": \"Pegasus_00\",\n" + + " \"modelName\": \"Pegasus\",\n" + + " \"hardwarePltCode\": \"mhp_npc\",\n" + + " \"hardwarePltName\": \"NPC\",\n" + + " \"softwarePltCode\": \"msp_nt2\",\n" + + " \"softwarePltName\": \"NT2\",\n" + + " \"modelYearInfoList\": [\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1\",\n" + + " \"yearName\": \"G1.1\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_g1.1.e\",\n" + + " \"yearName\": \"G1.1.E\"\n" + + " },\n" + + " {\n" + + " \"yearCode\": \"mp_G1.1.RH\",\n" + + " \"yearName\": \"G1.1.RH\"\n" + + " }\n" + + " ]\n" + + " }\n" + + " ],\n" + + " \"resultCode\": \"WL-0000\",\n" + + " \"resultDesc\": \"Success\"\n" + + "}"; + JSONObject result = (JSONObject) JSON.parse(jsonData); + JSONArray resultData = result.getJSONArray("resultData"); + String modelName = "";//项目名称 + String hardwarePltName = "";//车型平台 + String softwarePltName= "";//数字平台 + //获取resultData中所需的数据 + for(int i=0 ; i < resultData.size() ; i++){ + JSONObject jsonObject = resultData.getJSONObject(i); + modelName = jsonObject.getString("modelName");//项目名称 + hardwarePltName = jsonObject.getString("hardwarePltName");//车型平台 + softwarePltName= jsonObject.getString("softwarePltName");//数字平台 + String nameInfoId = UUID.randomUUID().toString().replace("-", ""); + + ProjectNameInfoEO projectNameInfoEO = new ProjectNameInfoEO(); + projectNameInfoEO.setId(nameInfoId); + projectNameInfoEO.setProjectName(modelName); + projectNameInfoEO.setVehiclePlatform(hardwarePltName); + projectNameInfoEO.setDigitalPlatform(softwarePltName); + //保存 + save(projectNameInfoEO); + + //设置年款名 + JSONArray modelYearInfoJson = jsonObject.getJSONArray("modelYearInfoList"); + for(int j=0 ; j < modelYearInfoJson.size() ; j++){ + JSONObject modelYearInfo = modelYearInfoJson.getJSONObject(j); + String yearName = modelYearInfo.getString("yearName"); + + ProjectYearNameInfoEO projectYearNameInfoEO = new ProjectYearNameInfoEO(); + projectYearNameInfoEO.setProjectNameId(nameInfoId); + projectYearNameInfoEO.setYearName(yearName); + //保存 + projectYearNameInfoEOService.save(projectYearNameInfoEO); + } + } } catch (Exception e) { e.printStackTrace(); }return sign; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectYearNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectYearNameInfoEOServiceImpl.java new file mode 100644 index 000000000..302472ee3 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectYearNameInfoEOServiceImpl.java @@ -0,0 +1,90 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.mapper.ProjectYearNameInfoEOMapper; +import com.jero.modules.project.service.IProjectYearNameInfoEOService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 项目库-项目名年号表 + * @Author: jero-boot + * @Date: 2022-05-20 + * @Version: V1.0 + */ +@Service +public class ProjectYearNameInfoEOServiceImpl extends ServiceImpl implements IProjectYearNameInfoEOService { + + /** + * 保存 + * + * @param projectYearNameInfoEO + * @return + */ + @Override + public void add(ProjectYearNameInfoEO projectYearNameInfoEO) { + Date now = new Date(); + projectYearNameInfoEO.setCreateTime(now); + projectYearNameInfoEO.setUpdateTime(now); + save(projectYearNameInfoEO); + } + + /** + * 更新 + * + * @param projectYearNameInfoEO + * @return + */ + @Override + public void editById(ProjectYearNameInfoEO projectYearNameInfoEO) { + Date now = new Date(); + projectYearNameInfoEO.setUpdateTime(now); + saveOrUpdate(projectYearNameInfoEO); + } + + /** + * 通过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 ProjectYearNameInfoEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList() { + return list(); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java index 2347963aa..ad3b26f61 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/service/SpaceServiceImpl.java @@ -70,12 +70,20 @@ public class SpaceServiceImpl implements ISpaceService { public String getSign() throws Exception { Map paramMap = new HashMap(); + paramMap.put("appId", appId);//在Program Space中注册的appId paramMap.put("bizData", "{\"module\":\"GRP\"}");//业务参数 paramMap.put("timestamp", String.valueOf(System.currentTimeMillis()));//请求时间 - paramMap.put("appId", appId);//在Program Space中注册的appId + String sign = sign(paramMap,appSecret);//签名字符串 paramMap.put("sign",sign);//签名字符串 +// paramMap.put("appId", appId);//在Program Space中注册的appId +// paramMap.put("bizData", "{\"module\":\"GRP\"}");//业务参数 +// paramMap.put("timestamp", "1652965354000");//请求时间 +// +//// String sign = sign(paramMap,appSecret);//签名字符串 +// paramMap.put("sign","148EF05BAB45F6D1213DA506D1D04E1B");//签名字符串 + // String response = HttpUtil.post(domainUrl, paramMap); String response = HttpRequest.post(domainUrl) .header("Content-Type", "application/x-www-form-urlencoded") diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index f46f19601..b2f48e359 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -14,16 +14,16 @@ server: mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/* management: - endpoints: - web: - exposure: - include: metrics,httptrace + endpoints: + web: + exposure: + include: metrics,httptrace spring: servlet: - multipart: - max-file-size: 500MB - max-request-size: 500MB + multipart: + max-file-size: 500MB + max-request-size: 500MB mail: host: smtp.163.com username: test@163.com @@ -131,19 +131,19 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: -# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -# username: root -# password: hzwlsoft.com -# driver-class-name: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + # username: root + # password: hzwlsoft.com + # driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai -# url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -# username: root -# password: 123456 -# driver-class-name: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + # url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false + # username: root + # password: 123456 + # driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://121.36.69.172:3307/laws_weilai?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false -# url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + # url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: hzwlsoft.com driver-class-name: com.mysql.cj.jdbc.Driver @@ -252,7 +252,7 @@ jero : port: 30007 logPath: logs/jero/job/jobhandler/ logRetentionDays: 30 - #自定义路由配置 yml nacos database + #自定义路由配置 yml nacos database route: config: data-id: jero-gateway-router @@ -310,10 +310,10 @@ justauth: # 云端OCR识别集成配置参数 OCR: #请求OCR转换接口 -# handleFileUrl: https://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion + # handleFileUrl: https://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -# callBackUrl: http://139.9.235.66:9110//api/ocr/OCRRestful/OcrHandleResult + # callBackUrl: http://139.9.235.66:9110//api/ocr/OCRRestful/OcrHandleResult callBackUrl: http://139.9.235.66:9022/local-tool/ocr/ocrHandleResult # OCR认证用户 userId: dayuzhou1234 @@ -391,8 +391,8 @@ Feishu: appSecret: DSfCrj70xku2VUjqwHBIuuY6HZnz7ppe # 正式 -# appId: cli_a2a1a6014679500d -# appSecret: AeHwisC82S0fhiREJg6bkdxhIZMevnZZ + # appId: cli_a2a1a6014679500d + # appSecret: AeHwisC82S0fhiREJg6bkdxhIZMevnZZ getTenantAccessTokenUrl: https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/ local-tool: @@ -407,25 +407,25 @@ opensso: --- - ## space系统 +## space系统 Space: # dev -# appId: PMP16517425636482D4A -# appSecret: 6a689580-bf3a-47ee-b3c5-a16d2312760d -# domainUrl: https://api-plm-portal-dev.nioint.com/api/v1/plm-portal-middle-integration + # appId: PMP16517425636482D4A + # appSecret: 6a689580-bf3a-47ee-b3c5-a16d2312760d + # domainUrl: https://api-plm-portal-dev.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule # test appId: PMP16521484118670676 appSecret: 4cf1b271-0c12-443d-964c-e61726b4ae0e - domainUrl: https://api-plm-portal-test.nioint.com/api/v1/plm-portal-middle-integration + domainUrl: https://api-plm-portal-test.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule # stg - # appId: PMP1652840272275F20C - # appSecret: fbf65763-a273-4df5-8a91-ef4db6d6e315 - # domainUrl: https://api-plm-portal-stg.nioint.com/api/v1/plm-portal-middle-integration + # appId: PMP1652840272275F20C + # appSecret: fbf65763-a273-4df5-8a91-ef4db6d6e315 + # domainUrl: https://api-plm-portal-stg.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule # prod # appId: PMP1652840319523B159 # appSecret: d3bf6e69-0726-42ee-91bd-0441a8f6ccdf -# domainUrl: https://api-plm-portal.nioint.com/api/v1/plm-portal-middle-integration +# domainUrl: https://api-plm-portal.nioint.com/api/v1/plm-portal-middle-integration/integration/api/common/queryModelByModule From c9e5b0eac615092f0084df874e24df0faaddbb8a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 20 May 2022 15:22:30 +0800 Subject: [PATCH 02/13] =?UTF-8?q?space=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/mapper/ProjectNameInfoEOMapper.java | 2 +- .../project/service/impl/ProjectNameInfoEOServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java index 42730de8a..540eb8ffb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @Version: V1.0 */ public interface ProjectNameInfoEOMapper extends BaseMapper { - @Select("select pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + + @Select("select pni.id,pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + "from project_name_info as pni\n" + "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;") List selectProjectNameAndYear(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java index ee7da8ae2..f93950a5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java @@ -105,9 +105,9 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl Date: Fri, 20 May 2022 15:39:15 +0800 Subject: [PATCH 03/13] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 +++ jero-web/src/common/lang/zh-cn.js | 7 +++++-- .../components/engineeringConfirmation.vue | 7 +++---- .../reviewedByThePersonInCharge.vue | 21 ++++++++++++------- .../projectManagement/components/TaskList.vue | 9 +++++--- .../projectManagement/components/addModel.vue | 1 + 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5ed1d3e16..1999a53a6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -862,4 +862,7 @@ module.exports = { fillInProjectDelivery:'Fill in project delivery', Resubmit:'Resubmit', Quantity:'Quantity', + pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results', + pleaseReviewTask:'Please add the engineering confirmation information for this review task', + pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', } \ 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 8c06b73b6..70210ba58 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -596,11 +596,11 @@ module.exports = { certificationType: '认证类型', certificationLevel: '认证级别', areaOfResponsibility: '责任领域', - confirmationOfDesignConformity: '设计符合性确认', + confirmationOfDesignConformity: '法规设计符合性确认', Deliverables: '交付物', personLiable: '责任人', PrehomoConfirmation: 'Pre-Homo确认', - verificationAndConformityconfirmation: '验证符合性确认', + verificationAndConformityconfirmation: '法规验证符合性确认', StandardImplementationDate: '标准实施日期', regulatoryEngineer: '法规工程师', certifiedEngineer: '认证工程师', @@ -867,4 +867,7 @@ module.exports = { fillInProjectDelivery:'填写工程交付', Resubmit:'重新提交', Quantity:'数量', + pleaseConfirmationResults:'请根据工程确认结果选择符合性状态', + pleaseReviewTask:'请您添加对该条审查任务的工程确认信息', + pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 896903852..cedee04b1 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -3,6 +3,8 @@
{{$t('engineeringConfirmation')}} +
@@ -394,11 +396,8 @@ columnsAll: [ { title: 'ID', - dataIndex: 'index', - key: 'index', + dataIndex: 'serialNumber', align: 'left', - width: 140, - customRender: (text, record, index) => `${index + 1}` }, { title: this.$t('completedBy'), diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 1631f0d12..550e59ad7 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -4,6 +4,9 @@
{{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}} +
@@ -125,18 +128,20 @@ - {{formInline.approvalOpinion}} + {{formInline.PersonChargeFeedback}} -
+
{{$t('sponsorReview')}} +
- +
@@ -221,7 +226,7 @@ this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') { this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = this.queryBy.approvalOpinion + this.formInline.PersonChargeFeedback = this.$route.query.PersonChargeFeedback this.formInline = { ...this.formInline } } if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') { @@ -231,9 +236,11 @@ this.formInline = { ...this.formInline } } if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') { - this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = this.queryBy.approvalOpinion - this.formInline = { ...this.formInline } + if (!this.$route.query.isDisplay) { + this.formInline.reviewResult = this.queryBy.reviewResult || undefined + this.formInline.approvalOpinion = this.$route.query.PersonChargeFeedback + this.formInline = { ...this.formInline } + } } }, methods: { diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 848f92710..d7a46d05a 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -296,7 +296,8 @@ remarks: 'designRemark', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.designTaskDetailId + primaryKeyId: val.designTaskDetailId, + PersonChargeFeedback:val.designPersonChargeFeedback, } break case 2: @@ -319,7 +320,8 @@ remarks: 'prehomoRemark', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.prehomoTaskDetailId + primaryKeyId: val.prehomoTaskDetailId, + PersonChargeFeedback:val.prehomoPersonChargeFeedback, } break case 3: @@ -342,7 +344,8 @@ remarks: 'verifyRemark', projectName: this.$route.query.projectName, projectNameId: this.$route.query.projectNameId, - primaryKeyId: val.verifyTaskDetailId + primaryKeyId: val.verifyTaskDetailId, + PersonChargeFeedback:val.verifyPersonChargeFeedback, } break } diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index cd17a6816..edeb32d39 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -286,6 +286,7 @@ this.visible = true this.title = this.$t('add') this.formInline = {} + this.getNameList() this.formInline.studioEngineerName = this.userInfo().username this.formInline.studioEngineer = this.userInfo().id this.$nextTick(() => { From 0ca5d9060b47ad0ff7882553acee648464059253 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 15:44:04 +0800 Subject: [PATCH 04/13] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/reviewedByThePersonInCharge.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 550e59ad7..1c204b22b 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -10,7 +10,7 @@
- +
@@ -39,7 +39,7 @@
- +
@@ -106,7 +106,8 @@
- +
@@ -120,7 +121,8 @@
- +
From 7c8edc7c7187288c5556c030c3358024cec45c50 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 20 May 2022 15:50:25 +0800 Subject: [PATCH 05/13] =?UTF-8?q?space=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectNameInfoEOController.java | 6 +- .../project/entity/ProjectNameInfoEO.java | 3 + .../service/IProjectNameInfoEOService.java | 2 +- .../impl/ProjectNameInfoEOServiceImpl.java | 89 +++++++++++-------- 4 files changed, 60 insertions(+), 40 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java index ad8e36248..08b2bd7db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java @@ -181,8 +181,8 @@ public class ProjectNameInfoEOController extends JeroController { - String getSpaceInfo(); + void getSpaceInfo(String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java index f93950a5a..6b31b777a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java @@ -4,11 +4,14 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.entity.ProjectYearNameInfoEO; import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.service.IProjectNameInfoEOService; import com.jero.modules.space.service.SpaceServiceImpl; +import com.jero.modules.system.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -104,12 +107,13 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl Date: Fri, 20 May 2022 16:08:22 +0800 Subject: [PATCH 06/13] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processForm/taskListProcess/index.vue | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 2bd386343..e979d8ff1 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -258,17 +258,22 @@ this.loading = true res.operatorTime = operatorTime if (this.$route.query.TaskKey == 'dreDispose') { - let dataSource = this.$refs.engineeringConfirmationRef.dataSource - let isTrue - for (let i = 0; i < dataSource.length; i++) { - if (dataSource[i].status == 'status' || !dataSource[i].status) { - - } - } - if (isTrue) { - this.dreSubmit(res) - } + this.dreSubmit(res) } else { + // let dataSource = this.$refs.engineeringConfirmationRef.dataSource + // let isTrue + // for (let i = 0; i < dataSource.length; i++) { + // if (dataSource[i].status == 'status' || !dataSource[i].status) { + // isTrue = true + // } else { + // isTrue = false + // this.$message.warning('') + // return + // } + // } + // if (isTrue) { + // + // } this.completeTask(res) } }) From 1f2ad3883b6cd064dcf9e3094ef953b55e459b03 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 16:30:17 +0800 Subject: [PATCH 07/13] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/processCenter/components/engineeringConfirmation.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index cedee04b1..3ef9448ae 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -616,6 +616,7 @@ } this.formInline.userId = userId.join(',') this.formInline.userName = userName.join(',') + this.formInline = {...this.formInline} } this.loadingTable = false } else { From 4b05bfe75eb3b93932390a64e197dbd58069b840 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 20 May 2022 17:02:59 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[update]=20=E8=AE=A4=E8=AF=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E5=BE=85=E5=8F=91=E8=B5=B7=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParameterItemCollectionList.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 8a8a08ac1..6e7463c75 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -306,7 +306,7 @@ export default { methods:{ // 判断是否有权限 认证工程师 待发起收集 // 添加 批量删除 下发收集 冻结配置 工程接口人列修改 - permission() { + permissionmoAndinitiated() { // 判断是否具有提交权限 // 认证工程师 // 定义开关 0为没有权限 1为有权限 @@ -429,9 +429,9 @@ export default { }, // 下发收集 distributionAndCollection() { - // 先判断是否有权限 - let permission = this.permission() - if(permission) { + // 先判断是否有权限 认证工程师 待发起收集 + let permissionmoAndinitiated = this.permissionmoAndinitiated() + if(permissionmoAndinitiated) { let _array = [] this.selectedRowKeysValue.forEach((item, index) => { _array.push(item.id) @@ -472,9 +472,9 @@ export default { }, // 添加 handleAdd() { - // 先判断是否有权限 - let permission = this.permission() - if(permission) { + // 先判断是否有权限 认证工程师 待发起收集 + let permissionmoAndinitiated = this.permissionmoAndinitiated() + if(permissionmoAndinitiated) { this.areaVisible = true } }, @@ -617,9 +617,9 @@ export default { this.$refs.CollectionTabel.getTableListReset() }, handleDel(){ - // 先判断是否有权限 - let permission = this.permission() - if(permission) { + // 先判断是否有权限 认证工程师 待发起收集 + let permissionmoAndinitiated = this.permissionmoAndinitiated() + if(permissionmoAndinitiated) { let param={ ids: this.selectedRowKeysArray } From 29780321da8b1cb45d1dec92a3660e0b1b4a2a61 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 20 May 2022 17:09:12 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=AD=97=E6=AE=B5--?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 115 +++++++++++++++++- .../modules/document/vo/QueryConditionVO.java | 22 ++++ 2 files changed, 131 insertions(+), 6 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vo/QueryConditionVO.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 28a689a0c..ca4c31514 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 @@ -13,9 +13,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; -import com.jero.common.constant.enums.*; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.IsMustEnum; +import com.jero.common.constant.enums.MessageTypeEnum; +import com.jero.common.constant.enums.ModuleEnum; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryRuleEnum; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; @@ -30,6 +35,7 @@ import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.utils.ReadPdfUtil; import com.jero.modules.document.utils.ReadWordUtil; +import com.jero.modules.document.vo.QueryConditionVO; import com.jero.modules.domain.service.DomainUserRelService; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.log.entity.BussLogEO; @@ -42,7 +48,11 @@ import com.jero.modules.split.entity.SarFileSplitInfoEO; import com.jero.modules.split.service.ISarFileSplitInfoService; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; -import com.jero.modules.system.entity.*; +import com.jero.modules.system.entity.SysAnnouncement; +import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysCategoryTreeVO; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysDepartService; @@ -56,8 +66,20 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ss.usermodel.*; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFDateUtil; +import org.apache.poi.hssf.usermodel.HSSFRichTextString; +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.CellStyle; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +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.poi.ss.util.CellRangeAddress; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.shiro.SecurityUtils; @@ -73,11 +95,26 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import java.util.stream.Collectors; @@ -5009,4 +5046,70 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryConditionVOList){ + if(queryConditionVOList.size() != 0){ + int count =0; + StringBuilder sb = new StringBuilder(); + for (QueryConditionVO queryConditionVO : queryConditionVOList) { + String type = queryConditionVO.getType();//and或or + String rule = queryConditionVO.getRule(); + String field = queryConditionVO.getField(); + String val = queryConditionVO.getVal(); + //如果查询字段对应的搜索条件值为空,则不作处理 + if(StringUtils.isNotBlank(val)){ + count ++;//从第二个查询条件开始拼接type(and或or) + sb.append(" " + field + " "); + //查询类型 + String ruleTemp = queryType(rule); + sb.append(ruleTemp + " "); + //在..中(用in-->特殊处理) + if(val.contains(",")){ + StringBuilder sbTemp = new StringBuilder(); + for (String valTemp : val.split(",")) { + sbTemp.append("'" + valTemp +"' ,"); + } + if(StringUtils.isNotBlank(sbTemp)){ + String substring = sbTemp.substring(0, sbTemp.length() - 1); + sb.append(substring); + } + }else{ + sb.append(val); + } + if(count > 1){ + sb.append(type + " "); + } + } + } + } + } + + + public String queryType(String rule){ + String value =""; + if(QueryRuleEnum.GT.getCondition().equals(rule)){ + value = QueryRuleEnum.GT.getValue(); + }else if(QueryRuleEnum.GE.getCondition().equals(rule)){ + value = QueryRuleEnum.GE.getValue(); + }else if(QueryRuleEnum.LT.getCondition().equals(rule)){ + value = QueryRuleEnum.LT.getValue(); + }else if(QueryRuleEnum.LE.getCondition().equals(rule)){ + value = QueryRuleEnum.LE.getValue(); + }else if(QueryRuleEnum.EQ.getCondition().equals(rule)){ + value = QueryRuleEnum.EQ.getValue(); + }else if(QueryRuleEnum.NE.getCondition().equals(rule)){ + value = QueryRuleEnum.NE.getValue(); + }else if(QueryRuleEnum.LIKE.getCondition().equals(rule)){ + value = QueryRuleEnum.LIKE.getValue(); + }else if(QueryRuleEnum.LEFT_LIKE.getCondition().equals(rule)){ + value = QueryRuleEnum.LEFT_LIKE.getValue(); + }else if(QueryRuleEnum.RIGHT_LIKE.getCondition().equals(rule)){ + value = QueryRuleEnum.RIGHT_LIKE.getValue(); + }else if(QueryRuleEnum.IN.getCondition().equals(rule)){ + value = QueryRuleEnum.IN.getValue(); + } + return value; + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vo/QueryConditionVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vo/QueryConditionVO.java new file mode 100644 index 000000000..e903dcf4e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/vo/QueryConditionVO.java @@ -0,0 +1,22 @@ +package com.jero.modules.document.vo; + +import lombok.Data; + +/** + * @description + * @date 2022/5/20 14:37 + * @auth zhn + */ +@Data +public class QueryConditionVO { + //类型(and或or) + private String type; + //查询类型 + private String rule; + //字段 + private String field; + //字段值 + private String val; + + +} From 8b7fe7d5333f729c840a6a39054eb2e1ed0ad260 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 17:10:53 +0800 Subject: [PATCH 10/13] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/engineeringConfirmation.vue | 12 +++---- .../components/taskCirculationHistory.vue | 4 --- .../processForm/taskListProcess/index.vue | 32 ++++++++++--------- 5 files changed, 24 insertions(+), 26 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1999a53a6..89ee54133 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -865,4 +865,5 @@ module.exports = { pleaseConfirmationResults:'Please select the compliance status according to the engineering confirmation results', pleaseReviewTask:'Please add the engineering confirmation information for this review task', pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', + pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status', } \ 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 70210ba58..42e45223d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -870,4 +870,5 @@ module.exports = { pleaseConfirmationResults:'请根据工程确认结果选择符合性状态', pleaseReviewTask:'请您添加对该条审查任务的工程确认信息', pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回', + pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 3ef9448ae..cc42503a8 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -49,13 +49,12 @@ {{$t('edit')}} @@ -66,13 +65,12 @@ {{$t('answer')}} {{$t('deleteLib')}} @@ -434,7 +432,7 @@ { title: this.$t('operation'), align: 'left', - width: 300, + width: 160, scopedSlots: { customRender: 'operation' } } ], diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index ad4dd00b0..853cd401e 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -46,26 +46,22 @@ title: this.$t('operationNode'), dataIndex: 'name', align: 'left', - width:'20%', }, { title: this.$t('Operator'), dataIndex: 'assignee', align: 'left', - width:'20%', }, { title: this.$t('result'), dataIndex: 'reviewResult', align: 'left', - width:'20%', scopedSlots: { customRender: 'reviewResult' } }, { title: this.$t('opinion'), dataIndex: 'approvalOpinion', align: 'left', - width:'20%', }, { title: this.$t('operationTime'), diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index e979d8ff1..623e1bf9b 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -260,21 +260,23 @@ if (this.$route.query.TaskKey == 'dreDispose') { this.dreSubmit(res) } else { - // let dataSource = this.$refs.engineeringConfirmationRef.dataSource - // let isTrue - // for (let i = 0; i < dataSource.length; i++) { - // if (dataSource[i].status == 'status' || !dataSource[i].status) { - // isTrue = true - // } else { - // isTrue = false - // this.$message.warning('') - // return - // } - // } - // if (isTrue) { - // - // } - this.completeTask(res) + if (this.$route.query.TaskKey == 'zrrclrw') { + let dataSource = this.$refs.engineeringConfirmationRef.dataSource + let isTrue + for (let i = 0; i < dataSource.length; i++) { + if (dataSource[i].status == 'haveDone' || !dataSource[i].status) { + isTrue = true + } else { + isTrue = false + this.$message.warning(this.$t('pleaseSubmitStatus')) + this.loading = false + return + } + } + if (isTrue) { + this.completeTask(res) + } + } } }) }, From 6b739a778057515a326bf3f0025433618ec19bdd Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 20 May 2022 17:34:26 +0800 Subject: [PATCH 11/13] update --- .../ConditionAssessmentEOController.java | 5 +-- .../entity/ProjectTaskInventoryEO.java | 8 +++++ .../IConditionAssessmentEOService.java | 2 +- .../ConditionAssessmentEOServiceImpl.java | 8 +++-- ...ojectTaskInventoryDetailEOServiceImpl.java | 34 +++++++++++++++---- 5 files changed, 45 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java index 2d8728df4..1d974adf6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ConditionAssessmentEOController.java @@ -2,6 +2,7 @@ package com.jero.modules.project.controller; import java.util.Arrays; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.api.vo.Result; @@ -66,8 +67,8 @@ public class ConditionAssessmentEOController extends JeroController> queryList() { - List list = conditionAssessmentEOService.queryList(); + public Result> queryList(@RequestParam Map params) { + List list = conditionAssessmentEOService.queryList(params); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java index 93ec53b52..71b0c542c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectTaskInventoryEO.java @@ -289,4 +289,12 @@ public class ProjectTaskInventoryEO implements Serializable { /**项目状态评估备注**/ @TableField(exist = false) private String projectStatusAssessRemark; + + + /**设计符合性 责任人填写反馈意见**/ + private String designPersonChargeFeedback; + /**prehomo 责任人填写反馈意见**/ + private String prehomoPersonChargeFeedback; + /**验证符合性 责任人填写反馈意见**/ + private String verifyPersonChargeFeedback; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java index 6739aaae3..11647eda4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IConditionAssessmentEOService.java @@ -61,7 +61,7 @@ public interface IConditionAssessmentEOService extends IService queryList(); + List< ConditionAssessmentEO> queryList(Map params); /** * 任务清单-项目状态评估表-添加或修改 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index 9e93b08fd..c2aa0db29 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -92,8 +92,12 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(Map params) { + String projectLawsInventoryId = (String) params.get("projectLawsInventoryId"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); + List conditionAssessmentEOS = super.baseMapper.selectList(queryWrapper); + return conditionAssessmentEOS; } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java index f26e8c986..f30681f54 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryDetailEOServiceImpl.java @@ -14,6 +14,7 @@ import com.jero.modules.project.util.SendMessageUtils; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -56,32 +57,39 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl projectTaskInventoryDetailEOList = new ArrayList<>(); + List projectTaskInventoryDetailEOAddList = new ArrayList<>(); + List projectTaskInventoryDetailEOUpdateList = new ArrayList<>(); //分发工程师数组。 JSONArray distributionEngineerList = jsonObject.getJSONArray("distributionEngineerList"); ProjectTaskInventoryDetailEO projectTaskInventoryDetail = null; for (Object distributionEngineer : distributionEngineerList) { projectTaskInventoryDetail = JSONObject.parseObject(JSONObject.toJSONString(distributionEngineer), ProjectTaskInventoryDetailEO.class); - String id = UUID.randomUUID().toString().replace("-", ""); - projectTaskInventoryDetail.setId(id); projectTaskInventoryDetail.setActiProcInstId(taskInventoryDetail.getActiProcInstId()); projectTaskInventoryDetail.setFlowType(taskInventoryDetail.getFlowType()); projectTaskInventoryDetail.setMsgType(taskInventoryDetail.getMsgType()); projectTaskInventoryDetail.setProjectTaskInventoryId(taskInventoryDetail.getProjectTaskInventoryId()); projectTaskInventoryDetail.setStatus(taskInventoryDetail.getStatus()); projectTaskInventoryDetail.setTaskDefinitionKey(taskInventoryDetail.getTaskDefinitionKey()); - projectTaskInventoryDetailEOList.add(projectTaskInventoryDetail); + + //这个工程师被分发过. + if(StringUtils.isNotEmpty(projectTaskInventoryDetail.getId())){ + projectTaskInventoryDetailEOUpdateList.add(projectTaskInventoryDetail); + }else { + String id = UUID.randomUUID().toString().replace("-", ""); + projectTaskInventoryDetail.setId(id); + projectTaskInventoryDetailEOAddList.add(projectTaskInventoryDetail); + } } - if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOList)){ + if(CollectionUtils.isNotEmpty(projectTaskInventoryDetailEOAddList)){ List userIdList = new ArrayList<>(); List createByList = new ArrayList<>(); List projectTaskInventoryFeedbackEOList = new ArrayList<>(); String serialNumber = projectTaskInventoryFeedbackEOService.createSerialNumber(); - for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOList) { + for (ProjectTaskInventoryDetailEO projectTaskInventoryDetailEO : projectTaskInventoryDetailEOAddList) { QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); sysUserQueryWrapper.lambda().eq(SysUser::getId,projectTaskInventoryDetailEO.getUserId()); List sysUserList = sysUserService.getBaseMapper().selectList(sysUserQueryWrapper); @@ -119,9 +127,21 @@ public class ProjectTaskInventoryDetailEOServiceImpl extends ServiceImpl updateWrapper = new QueryWrapper<>(); + updateWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getProjectTaskInventoryId,projectTaskInventoryDetailEO.getId()); + projectTaskInventoryFeedbackEOService.update(projectTaskInventoryFeedbackEO,updateWrapper); + } + + super.updateBatchById(projectTaskInventoryDetailEOUpdateList); + } } /** From 5d07ce440de80fd272991c32bf63781d813b0a43 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 20 May 2022 17:44:40 +0800 Subject: [PATCH 12/13] =?UTF-8?q?space=E7=B3=BB=E7=BB=9F=E5=85=B3=E8=81=94?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectNameInfoEOController.java | 6 ------ .../project/entity/ProjectLibraryBase.java | 8 ++++++++ .../project/mapper/ProjectNameInfoEOMapper.java | 2 +- .../mapper/xml/ProjectLibraryBaseMapper.xml | 16 ++++++++++------ .../impl/ProjectLibraryBaseServiceImpl.java | 16 ++++++++++++++++ .../impl/ProjectNameInfoEOServiceImpl.java | 4 ++-- 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java index 08b2bd7db..098f5ef40 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectNameInfoEOController.java @@ -9,7 +9,6 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.service.IProjectNameInfoEOService; -import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -70,11 +69,6 @@ public class ProjectNameInfoEOController extends JeroController> queryList() { List list = projectNameInfoEOService.queryList(); - for(ProjectNameInfoEO projectNameInfoEO : list){ - if(StringUtils.isNotBlank(projectNameInfoEO.getYearName())){ - projectNameInfoEO.setProjectName(projectNameInfoEO.getProjectName()+ "-" +projectNameInfoEO.getYearName()); - } - } return Result.OK(list); } 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 50d39037d..2550d2f76 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 @@ -37,6 +37,12 @@ public class ProjectLibraryBase implements Serializable { @TableField(exist = false) private java.lang.String projectName; + /**年款号id*/ + private java.lang.String yearNameId; + /**年款名称*/ + @TableField(exist = false) + private java.lang.String yearName; + /**目标市场*/ @Dict(dicCode = "region") private java.lang.String targetMarket; @@ -56,9 +62,11 @@ public class ProjectLibraryBase implements Serializable { private java.lang.String certificationEngineerName; /**车型平台*/ + @TableField(exist = false) private java.lang.String vehiclePlatform; /**数字平台*/ + @TableField(exist = false) private java.lang.String digitalPlatform; /**IPD信息*/ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java index 540eb8ffb..90a1c1774 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectNameInfoEOMapper.java @@ -13,7 +13,7 @@ import java.util.List; * @Version: V1.0 */ public interface ProjectNameInfoEOMapper extends BaseMapper { - @Select("select pni.id,pni.project_name,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + + @Select("select pni.id,pni.project_name,pnyi.id as year_id,pyni.year_name,pni.vehicle_platform,pni.digital_platform\n" + "from project_name_info as pni\n" + "left join project_year_name_info as pyni on pni.id=pyni.project_name_id;") List selectProjectNameAndYear(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index caae401ed..a0f45c3a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -5,6 +5,7 @@ + @@ -26,6 +27,8 @@ plb.id, plb.project_name_id, pni.project_name as project_name, + pyni.id as year_name_id, + pyni.year_name, plb.target_market, plb.project_status, plb.studio_engineer, @@ -44,6 +47,7 @@ from project_library_base as plb left join project_name_info as pni on plb.project_name_id=pni.id left join sys_user as studiouser on plb.studio_engineer=studiouser.id + left join project_year_name_info as pyni on plb.year_name_id=pyni.id diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 52ebdac04..8b34e9960 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -10,9 +10,11 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ConditionAssessmentEO; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectNameInfoEO; import com.jero.modules.project.enums.*; import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; +import com.jero.modules.project.mapper.ProjectNameInfoEOMapper; import com.jero.modules.project.mapper.ProjectTaskInventoryEOMapper; import com.jero.modules.project.service.IConditionAssessmentEOService; import com.jero.modules.project.service.IProjectLibraryBaseService; @@ -73,6 +75,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear(); +// projectNameAndYear.stream().filter("year_id") save(projectLibraryBase); //创建任务计划时间轴 @@ -168,6 +179,11 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params); List records = result.getRecords(); disposeData(records); + for(ProjectLibraryBase projectLibraryBase: records){ + if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); + } + } return result; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java index 6b31b777a..2165d6493 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectNameInfoEOServiceImpl.java @@ -28,7 +28,7 @@ import java.util.UUID; @Service public class ProjectNameInfoEOServiceImpl extends ServiceImpl implements IProjectNameInfoEOService { @Autowired - private ProjectNameInfoEOMapper prjectNameMapper; + private ProjectNameInfoEOMapper projectNameInfoEOMapper; @Autowired private SpaceServiceImpl spaceService; @@ -102,7 +102,7 @@ public class ProjectNameInfoEOServiceImpl extends ServiceImpl queryList() { - List projectNameAndYear = prjectNameMapper.selectProjectNameAndYear(); + List projectNameAndYear = projectNameInfoEOMapper.selectProjectNameAndYear(); return projectNameAndYear; } From 676a26ba31b5ebcc3f3c2a700429960027b121d8 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 20 May 2022 18:07:26 +0800 Subject: [PATCH 13/13] =?UTF-8?q?der=E6=8F=90=E4=BA=A4=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= 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/taskCirculationHistory.vue | 15 ++- .../projectManagement/components/TaskList.vue | 6 +- .../components/TaskListModel.vue | 78 ++++++++++++++- .../projectManagement/components/addModel.vue | 96 ++++++++++++++----- 6 files changed, 160 insertions(+), 39 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 89ee54133..727b31efc 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -866,4 +866,6 @@ module.exports = { pleaseReviewTask:'Please add the engineering confirmation information for this review task', pleaseWillBeReturned:'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned', pleaseSubmitStatus:'Please submit the data confirmed by the project in the confirmation status', + modelName:'Model Name', + modelYear:'Model year', } \ 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 42e45223d..d90e9d8f9 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -871,4 +871,6 @@ module.exports = { pleaseReviewTask:'请您添加对该条审查任务的工程确认信息', pleaseWillBeReturned:'请对工程确认结果和责任人审查结果进行再次确认，若符合要求则进行提交，否则进行退回', pleaseSubmitStatus:'请把工程确认的数据都点为确认状态进行提交', + modelName:'车型名称', + modelYear:'年款', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 853cd401e..bc076dc53 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -45,12 +45,12 @@ { title: this.$t('operationNode'), dataIndex: 'name', - align: 'left', + align: 'left' }, { title: this.$t('Operator'), dataIndex: 'assignee', - align: 'left', + align: 'left' }, { title: this.$t('result'), @@ -61,17 +61,14 @@ { title: this.$t('opinion'), dataIndex: 'approvalOpinion', - align: 'left', + align: 'left' }, { title: this.$t('operationTime'), - dataIndex: 'operatorTime', + dataIndex: 'createTime', align: 'left', - width:200, - fixed: 'right', - customRender: function(t, r, index) { - return moment(t).format('YYYY-MM-DD HH:mm:ss') - } + width: 200, + fixed: 'right' } ], downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download' diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index d7a46d05a..2abd5697d 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -211,14 +211,16 @@ 'Non-Compliance': 'nonConformityColor', 'To be tracked': 'TrackedColor', 'NA': 'notInvolvedColor', - 'No rating': 'submittedColor' + 'No rating': 'submittedColor', + 'Termination of task': 'nonConformityColor', }, statusText: { 'Compliance': this.$t('accord'), 'Non-Compliance': this.$t('nonConformity'), 'To be tracked': this.$t('Tracked'), 'NA': this.$t('notInvolved'), - 'No rating': this.$t('toBeConfirmed') + 'No rating': this.$t('toBeConfirmed'), + 'Termination of task': this.$t('taskTermination'), }, CertificationColor: { 'Test passed': 'accordColor', diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue index 80e5e71e0..c8a11adfd 100644 --- a/jero-web/src/views/projectManagement/components/TaskListModel.vue +++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue @@ -47,7 +47,7 @@
- +
- +
+ +
+ +
+
+ {{$t('CurrentProjectStatusEvaluation')}} +
+ + + + + {{ $t('red') }} + + + + + {{ $t('yellow') }} + + + + + {{ $t('green') }} + + + + + + {{ $t('blue') }} + + + + +
+ + + +
+
+ {{$t('remarks')}} +
+ + + +
+ +
+