WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-05-18 18:28:11 +08:00
parent 4ac806b1c0 d09aeac7b1
commit 93fba3cea6
83 changed files with 3904 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java
+2 -1
View File
@@ -12,7 +12,8 @@ public enum ModuleEnum {
FILE_SPLIT_ITEMS("文档拆分条款","4"),
ONL_CGFORM_COLLECTION("我的收藏","5"),
ONL_CGFORM_SUBSCRIBE("我的订阅","6"),
PARAMS_COLLECT_MANIFEST("参数收集清单","7");
PARAMS_COLLECT_MANIFEST("参数收集清单","7"),
PARAMS_REPORT_DETAIL("上报库参数项","8");
String name;
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java
+2 -1
View File
@@ -14,7 +14,8 @@ public enum TableEnum {
TAG_AREA("onl_cgform_area"),
ONL_CGFORM_COLLECTION("onl_cgform_collection"),
ONL_CGFORM_SUBSCRIBE("onl_cgform_subscribe"),
PARAMS_COLLECT_MANIFEST("params_collect_manifest");
PARAMS_COLLECT_MANIFEST("params_collect_manifest"),
PARAMS_REPORT_DETAIL("params_report_detail");
String table;
jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java
+2
View File
@@ -828,6 +828,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl<OnlCgformFieldMapper,
fieldList = onlCgformFieldMapper.getFieldList(TableEnum.ONL_CGFORM_SUBSCRIBE.getTable());
} else if (ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue().equals(flag)) {
fieldList = onlCgformFieldMapper.getFieldList(TableEnum.PARAMS_COLLECT_MANIFEST.getTable());
} else if (ModuleEnum.PARAMS_REPORT_DETAIL.getValue().equals(flag)) {
fieldList = onlCgformFieldMapper.getFieldList(TableEnum.PARAMS_REPORT_DETAIL.getTable());
}
return fieldList;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java
+51
View File
@@ -45,6 +45,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-表头中英文切换")
@ApiOperation(value="参数项收集清单-表头中英文切换", notes="参数项收集清单-表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("params:collectManifest:list")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
@@ -60,6 +61,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-列表查询")
@ApiOperation(value="参数项收集清单-列表查询", notes="参数项收集清单-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("params:collectManifest:list")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
@@ -85,6 +87,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-提交")
@ApiOperation(value="参数项收集清单-提交", notes="参数项收集清单-提交")
@PostMapping(value = "/submit")
// @RequiresPermissions("params:collectManifest:submit")
public Result<?> submit(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.submit(paramsCollectManifestVO.getConfigDataList());
if (isSuccess) {
@@ -103,6 +106,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-添加查询")
@ApiOperation(value="参数项收集清单-添加查询", notes="参数项收集清单-添加查询")
@GetMapping(value = "/paramsInfoList")
// @RequiresPermissions("params:collectManifest:add")
public Result<List<ParamsInfoPublishEO>> paramsInfoList(ParamsCollectManifestVO paramsCollectManifestVO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber())) {
@@ -125,6 +129,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-添加")
@ApiOperation(value="参数项收集清单-添加", notes="参数项收集清单-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("params:collectManifest:add")
public Result<?> add(@Validated @RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.add(paramsCollectManifestVO);
if (isSuccess) {
@@ -143,6 +148,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-批量删除")
@ApiOperation(value="参数项收集清单-批量删除", notes="参数项收集清单-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("params:collectManifest:delete")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
@@ -161,6 +167,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-查询工程接口人列表")
@ApiOperation(value="参数项收集清单-查询工程接口人列表", notes="参数项收集清单-查询工程接口人列表")
@GetMapping(value = "/querySdtList")
// @RequiresPermissions("params:collectManifest:sdt")
public Result<List<Map<String,String>>> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String,String>> sdtList = paramsCollectManifestEOService.querySdtList(paramsCollectManifestVO);
return Result.OK(sdtList);
@@ -175,6 +182,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-判断当前登录用户类型")
@ApiOperation(value="参数项收集清单-判断当前登录用户类型", notes="参数项收集清单-判断当前登录用户类型")
@GetMapping(value = "/getLoginUserType")
// @RequiresPermissions("params:collectManifest:list")
public Result<?> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO) {
String loginUserType = paramsCollectManifestEOService.getLoginUserTypes(paramsCollectManifestVO);
return Result.OK(loginUserType);
@@ -189,6 +197,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-退回")
@ApiOperation(value="参数项收集清单-退回", notes="参数项收集清单-退回")
@PostMapping(value = "/back")
// @RequiresPermissions("params:collectManifest:back")
public Result<?> back(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.goBack(paramsCollectManifestVO);
if (isSuccess) {
@@ -207,6 +216,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-撤回")
@ApiOperation(value="参数项收集清单-撤回", notes="参数项收集清单-撤回")
@PostMapping(value = "/withdraw")
// @RequiresPermissions("params:collectManifest:withdraw")
public Result<?> withdraw(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.withdraw(paramsCollectManifestVO);
if (isSuccess) {
@@ -225,6 +235,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-设置截止时间")
@ApiOperation(value="参数项收集清单-设置截止时间", notes="参数项收集清单-设置截止时间")
@PostMapping(value = "/updateDeadlineBatch")
// @RequiresPermissions("params:collectManifest:deadline")
public Result<?> updateDeadlineBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateDeadlineBatch(paramsCollectManifestVO);
if (isSuccess) {
@@ -243,6 +254,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-分配工程接口人")
@ApiOperation(value="参数项收集清单-分配工程接口人", notes="参数项收集清单-分配工程接口人")
@PostMapping(value = "/updateSdt")
// @RequiresPermissions("params:collectManifest:sdt")
public Result<?> updateSdt(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateSdt(paramsCollectManifestVO);
if (isSuccess) {
@@ -261,6 +273,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-分配填写人")
@ApiOperation(value="参数项收集清单-分配填写人", notes="参数项收集清单-分配填写人")
@PostMapping(value = "/updateDreBatch")
// @RequiresPermissions("params:collectManifest:dre")
public Result<?> updateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.updateDreBatch(paramsCollectManifestVO);
if (isSuccess) {
@@ -279,6 +292,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-下发收集")
@ApiOperation(value="参数项收集清单-下发收集", notes="参数项收集清单-下发收集")
@PostMapping(value = "/issueCollection")
// @RequiresPermissions("params:collectManifest:issue")
public Result<?> issueCollection(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.issueCollection(paramsCollectManifestVO);
if (isSuccess) {
@@ -297,6 +311,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@PostMapping(value = "/getConfigLableList")
// @RequiresPermissions("params:collectManifest:lock")
public Result<?> getConfigLableList(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
return Result.OK(configLableList);
@@ -311,6 +326,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-冻结配置")
@ApiOperation(value="参数项收集清单-冻结配置", notes="参数项收集清单-冻结配置")
@PostMapping(value = "/lockConfigColumn")
// @RequiresPermissions("params:collectManifest:lock")
public Result<?> lockConfigColumn(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.lockConfigColumn(paramsCollectManifestVO);
if (isSuccess) {
@@ -320,6 +336,21 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 冻结配置，引用参数-下拉选项
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-配置下拉选项")
@ApiOperation(value="参数项收集清单-配置下拉选项", notes="参数项收集清单-配置下拉选项")
@PostMapping(value = "/getConfigLableListR")
// @RequiresPermissions("params:collectManifest:refer")
public Result<?> getConfigLableListRefer(ParamsCollectManifestVO paramsCollectManifestVO) {
List<Map<String, String>> configLableList = paramsCollectManifestEOService.getConfigLabelList(paramsCollectManifestVO);
return Result.OK(configLableList);
}
/**
* 引用参数
*
@@ -329,6 +360,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
@AutoLog(value = "参数项收集清单-引用参数")
@ApiOperation(value="参数项收集清单-引用参数", notes="参数项收集清单-引用参数")
@PostMapping(value = "/referParams")
// @RequiresPermissions("params:collectManifest:refer")
public Result<?> referParams(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.referParams(paramsCollectManifestVO);
if (isSuccess) {
@@ -338,6 +370,25 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
}
}
/**
* 同步上报库
*
* @param paramsCollectManifestVO
* @return
*/
@AutoLog(value = "参数项收集清单-同步上报库")
@ApiOperation(value="参数项收集清单-同步上报库", notes="参数项收集清单-同步上报库")
@PostMapping(value = "/syncReport")
// @RequiresPermissions("params:collectManifest:sync")
public Result<?> syncReport(ParamsCollectManifestVO paramsCollectManifestVO) {
boolean isSuccess = paramsCollectManifestEOService.syncReport(paramsCollectManifestVO);
if (isSuccess) {
return Result.OK("同步上报库成功！");
} else {
return Result.error("同步上报库失败！");
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestHistoryEOController.java
+2
View File
@@ -47,6 +47,7 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
@AutoLog(value = "历史参数项收集清单-表头中英文切换")
@ApiOperation(value="历史参数项收集清单-表头中英文切换", notes="历史参数项收集清单-表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("params:manifest:history")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
@@ -62,6 +63,7 @@ public class ParamsCollectManifestHistoryEOController extends JeroController<Par
@AutoLog(value = "历史参数项收集清单-列表查询")
@ApiOperation(value="历史参数项收集清单-列表查询", notes="历史参数项收集清单-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("params:manifest:history")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java
+4 -1
View File
@@ -3,9 +3,9 @@ package com.jero.modules.cert.collect.controller;
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.modules.cert.collect.vo.ParamsConfigVO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.vo.ParamsConfigVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -38,6 +38,7 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@AutoLog(value = "参数配置-列表查询")
@ApiOperation(value="参数配置-列表查询", notes="参数配置-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("params:config:list")
public Result<List<ParamsConfigEO>> queryList(@RequestParam(name = "cut") String cut,
@RequestParam(name = "paramsManifestId") String paramsManifestId) {
List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
@@ -52,6 +53,7 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@AutoLog(value = "参数配置-批量添加")
@ApiOperation(value="参数配置-批量添加", notes="参数配置-批量添加")
@PostMapping(value = "/addBatch")
// @RequiresPermissions("params:config:addBatch")
public Result<?> addBatch(@RequestBody ParamsConfigVO paramsConfigVO) {
String paramsManifestId = paramsConfigVO.getParamsManifestId();
if (StringUtils.isBlank(paramsManifestId)) {
@@ -69,6 +71,7 @@ public class ParamsConfigEOController extends JeroController<ParamsConfigEO, IPa
@AutoLog(value = "参数配置-查看单个详情")
@ApiOperation(value="参数配置-查看单个详情", notes="参数配置-查看单个详情")
@GetMapping(value = "/getById")
// @RequiresPermissions("params:config:list")
public Result<ParamsConfigEO> getById(@RequestParam(name = "id") String id) {
ParamsConfigEO paramsConfigEO = paramsConfigEOService.getById(id);
return Result.OK(paramsConfigEO);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+23 -4
View File
@@ -52,6 +52,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-分页列表查询")
@ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("params:manifest:page")
public Result<?> queryPageList(ParamsManifestEO paramsManifestEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -74,6 +75,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-参数模板列表查询")
@ApiOperation(value="参数清单-参数模板列表查询", notes="参数清单-参数模板列表查询")
@GetMapping(value = "/getParamsTemplateList")
// @RequiresPermissions("params:manifest:add")
public Result<List<ParamsTemplateEO>> getParamsTemplateList(ParamsTemplateEO paramsTemplateEO,
@RequestParam(name="cut") String cut) {
List<ParamsTemplateEO> list = paramsManifestEOService.getNewestPublishList(paramsTemplateEO);
@@ -88,6 +90,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-标题唯一校验")
@ApiOperation(value="参数清单-标题唯一校验", notes="参数清单-标题唯一校验")
@GetMapping(value = "/verifyTitle")
// @RequiresPermissions("params:manifest:add")
public Result<?> verifyTitle(String title, String projectId) {
LambdaQueryWrapper<ParamsManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsManifestEO::getTitle, title);
@@ -108,6 +111,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-添加")
@ApiOperation(value="参数清单-添加", notes="参数清单-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("params:manifest:add")
public Result<?> add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
boolean isSuccess = paramsManifestEOService.add(paramsManifestEO);
if (isSuccess) {
@@ -126,6 +130,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-编辑")
@ApiOperation(value="参数清单-编辑", notes="参数清单-编辑")
@PostMapping(value = "/edit")
// @RequiresPermissions("params:manifest:edit")
public Result<?> edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO);
if (isSuccess) {
@@ -144,9 +149,14 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-通过id删除")
@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
@GetMapping(value = "/delete")
// @RequiresPermissions("params:manifest:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
paramsManifestEOService.deleteById(id);
return Result.OK("删除成功!");
boolean isSuccess = paramsManifestEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功!");
} else {
return Result.error("删除失败！");
}
}
/**
@@ -158,9 +168,14 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-批量删除")
@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("params:manifest:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
boolean isSuccess = paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功!");
} else {
return Result.error("批量删除失败！");
}
}
/**
@@ -172,6 +187,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-变更扩展")
@ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展")
@GetMapping(value = "/changeExtension")
// @RequiresPermissions("params:manifest:change")
public Result<?> changeExtension(@RequestParam(name="id",required=true) String id) {
boolean isSuccess = paramsManifestEOService.changeExtension(id);
if(isSuccess) {
@@ -190,6 +206,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-历史版本")
@ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
@GetMapping(value = "/history")
// @RequiresPermissions("params:manifest:history")
public Result<?> history(@RequestParam(name="title",required=true) String title) {
List<ParamsManifestHistoryVO> historyVersionList = paramsManifestEOService.getHistoryVersionList(title);
return Result.OK(historyVersionList);
@@ -204,6 +221,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-查询所有项目的所有参数清单")
@ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
@GetMapping(value = "/getAllManifest")
// @RequiresPermissions("params:manifest:copy")
public Result<?> getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="projectName",required=false) String projectName) {
@@ -221,6 +239,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-复制清单")
@ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
@PostMapping(value = "/copy")
// @RequiresPermissions("params:manifest:copy")
public Result<?> copy(ParamsManifestEO paramsManifestEO,
@RequestParam(name="sourceManifestId",required=true) String sourceManifestId) {
ParamsManifestEO manifestEO = paramsManifestEOService.copy(paramsManifestEO, sourceManifestId);
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+2 -2
View File
@@ -44,10 +44,10 @@
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
AND duty_territory LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dutyTerritory}),'%')
AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%')
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
<choose>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestHistoryEOMapper.xml
+2 -16
View File
@@ -26,7 +26,6 @@
<result column="dre" property="dre" />
<result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="change_flag" property="changeFlag" />
</resultMap>
<sql id="BaseQuerySql">
<where>
@@ -44,23 +43,10 @@
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.dutyTerritory !=null and paramsCollectManifestEO.dutyTerritory !=''">
AND duty_territory LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dutyTerritory}),'%')
AND duty_territory = #{paramsCollectManifestEO.dutyTerritory}
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%')
</if>
<if test="paramsCollectManifestEO.userTypes !=null and paramsCollectManifestEO.userTypes !=''">
<choose>
<when test="paramsCollectManifestEO.userTypes == 'sdt'">
AND sdt = #{paramsCollectManifestEO.sdt}
</when>
<when test="paramsCollectManifestEO.userTypes == 'dre'">
AND dre = #{paramsCollectManifestEO.dre}
</when>
<when test="paramsCollectManifestEO.userTypes == 'sdt,dre'">
AND (sdt = #{paramsCollectManifestEO.sdt} or dre = #{paramsCollectManifestEO.dre})
</when>
</choose>
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
</if>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java
+3
View File
@@ -119,4 +119,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
// 引用参数
boolean referParams(ParamsCollectManifestVO paramsCollectManifestVO);
// 同步上报库
boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java
+2 -2
View File
@@ -38,7 +38,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
* @param id
* @return
*/
void deleteById(String id);
boolean deleteById(String id);
/**
* 批量删除
@@ -46,7 +46,7 @@ public interface IParamsManifestEOService extends IService<ParamsManifestEO> {
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+121 -10
View File
@@ -15,6 +15,7 @@ import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServi
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import com.jero.modules.cert.collect.entity.ParamsManifestEO;
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
import com.jero.modules.cert.collect.enums.CollectManifestUserTypeEnum;
import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
@@ -23,10 +24,15 @@ import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper;
import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService;
import com.jero.modules.cert.collect.service.IParamsConfigDataEOService;
import com.jero.modules.cert.collect.service.IParamsConfigEOService;
import com.jero.modules.cert.collect.service.IParamsManifestEOService;
import com.jero.modules.cert.collect.vo.ParamsCollectManifestVO;
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.report.entity.*;
import com.jero.modules.cert.report.service.*;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.jero.modules.cert.template.entity.ParamsInfoPublishEO;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOService;
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.ocr.util.LineHumpUtil;
@@ -66,36 +72,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
@Autowired
private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper;
@Autowired
private OnlCgformFieldServiceImpl onlCgformFieldService;
@Autowired
private IParamsConfigEOService paramsConfigEOService;
@Autowired
private IParamsConfigDataEOService paramsConfigDataEOService;
@Autowired
private ISysDictItemService sysDictItemService;
@Autowired
private IOSSFileService ossFileService;
@Autowired
private IParamsInfoPublishEOService paramsInfoPublishEOService;
@Autowired
private ICertCategoryParamsInfoPublishEOService certCategoryParamsInfoPublishEOService;
@Autowired
private IProjectRelatedPersonnelService projectRelatedPersonnelService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private IFeishuService feishuService;
@Autowired
private ISysAnnouncementService sysAnnouncementService;
@Autowired
private IParamsReportEOService paramsReportEOService;
@Autowired
private IParamsReportDetailEOService paramsReportDetailEOService;
@Autowired
private IParamsReportConfigEOService paramsReportConfigEOService;
@Autowired
private IParamsReportConfigDataEOService paramsReportConfigDataEOService;
@Autowired
private IParamsManifestEOService paramsManifestEOService;
@Autowired
private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
@Value(value = "${jero.backUrl}")
@@ -1054,6 +1066,105 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
return paramsConfigDataEOService.updateBatchById(updateConfigDataEOList);
}
@Override
public boolean syncReport(ParamsCollectManifestVO paramsCollectManifestVO) {
String paramsCollectManifestIds = paramsCollectManifestVO.getIds();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
List<String> paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(","));
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
// 根据收集库清单id 的是否上报过
boolean isSync = paramsReportEOService.isSync(paramsManifestId);
String reportId = null;
if (!isSync) {
reportId = UUID.randomUUID().toString().replace("-","");
} else {
ParamsReportEO paramsReportEO = paramsReportEOService.queryByOldParamsManifestId(paramsManifestId);
reportId = paramsReportEO.getId();
}
// 配置
List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
List<ParamsReportConfigEO> addReportConfigEOList = new ArrayList<>();
List<ReportCertCategoryParamsInfoEO> addReportCertCategoryParamsInfoEOList = new ArrayList<>();
if (!isSync) { // 未上报
// 复制配置
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsReportConfigEO addReportConfigEO = new ParamsReportConfigEO();
BeanUtils.copyProperties(configEO, addReportConfigEO); // 全盘复制,包括id
addReportConfigEO.setParamsManifestId(reportId);
addReportConfigEOList.add(addReportConfigEO);
}
}
// 添加参数项到上报库
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.selectBatchIds(paramsCollectManifestIdList);
List<ParamsReportDetailEO> addReportDetailEOList = new ArrayList<>();
List<ParamsReportConfigDataEO> addReportConfigDataEOList = new ArrayList<>(); // 需要添加的配置数据
Date syncTime = new Date();
for (ParamsCollectManifestEO collectManifestEO : paramsCollectManifestEOList) {
ParamsReportDetailEO addReportDetailEO = new ParamsReportDetailEO();
BeanUtils.copyProperties(collectManifestEO, addReportDetailEO);
String reportDetailId = UUID.randomUUID().toString().replace("-","");
addReportDetailEO.setId(reportDetailId);
addReportDetailEO.setParamsManifestId(reportId);
addReportDetailEO.setSyncTime(syncTime);
addReportDetailEOList.add(addReportDetailEO);
// 添加配置数据
for (ParamsConfigEO configEO : paramsConfigEOList) {
ParamsConfigDataEO configDataEO = paramsConfigDataEOService.queryByConfigIdAndCollectManifestId(configEO.getId(), collectManifestEO.getId());
ParamsReportConfigDataEO addReportConfigDataEO = new ParamsReportConfigDataEO();
BeanUtils.copyProperties(configDataEO, addReportConfigDataEO);
addReportConfigDataEO.setParamsCollectManifestId(reportDetailId);
addReportConfigDataEOList.add(addReportConfigDataEO);
}
}
// 复制认证类别参数
List<String> nioNumberList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getNioNumber).collect(Collectors.toList());
List<CertCategoryParamsInfoPublishEO> certCategoryParamsInfoPublishEOS = certCategoryParamsInfoPublishEOService.queryListByVersionAndNio(paramsManifestEO.getParamsTemplateId(), paramsManifestEO.getParamsTemplatePublishVersion(), nioNumberList);
for (CertCategoryParamsInfoPublishEO ccpi : certCategoryParamsInfoPublishEOS) {
ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO();
BeanUtils.copyProperties(ccpi, addCcpi); // 全盘复制,包括id
addReportCertCategoryParamsInfoEOList.add(addCcpi);
}
// 添加认证类别参数信息
reportCertCategoryParamsInfoEOService.saveBatch(addReportCertCategoryParamsInfoEOList);
// 添加参数项
paramsReportDetailEOService.saveBatch(addReportDetailEOList);
// 添加配置
paramsReportConfigEOService.saveBatch(addReportConfigEOList);
// 添加配置数据
paramsReportConfigDataEOService.saveBatch(addReportConfigDataEOList);
// 添加上报库
ParamsReportEO addReportEO = new ParamsReportEO();
addReportEO.setId(reportId);
addReportEO.setOldParamsManifestId(paramsManifestId);
addReportEO.setVersion(paramsManifestEO.getVersion());
paramsReportEOService.save(addReportEO);
// 修改收集库参数项状态
List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
for (String paramsCollectManifestId : paramsCollectManifestIdList) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestId);
updateEO.setState(CollectManifestStateEnum.SYNC_REPORT.getValue()); // 设置状态为：待工程接口人处理
updateEOList.add(updateEO);
}
return updateBatchById(updateEOList);
}
/**
* 实体对象转成Map
* @param obj 实体对象
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestHistoryEOServiceImpl.java
+1 -11
View File
@@ -61,17 +61,7 @@ public class ParamsCollectManifestHistoryEOServiceImpl extends ServiceImpl<Param
public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
// String userTypes = paramsCollectManifestEO.getUserTypes();
// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录用户
// if ("sdt".equals(userTypes)) {
// paramsCollectManifestEO.setSdt(loginUser.getUsername());
// } else if ("dre".equals(userTypes)) {
// paramsCollectManifestEO.setDre(loginUser.getUsername());
// } else if ("sdt,dre".equals(userTypes)) {
// paramsCollectManifestEO.setSdt(loginUser.getUsername());
// paramsCollectManifestEO.setDre(loginUser.getUsername());
// }
List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 TODO 添加用户类型权限
List<ParamsCollectManifestHistoryEO> list = paramsCollectManifestHistoryEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsConfigHistoryEO> paramsConfigEOList = paramsConfigHistoryEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+4 -4
View File
@@ -149,7 +149,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
* @return
*/
@Override
public void deleteById(String id) {
public boolean deleteById(String id) {
// 关联删除配置
LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
configEOQueryWrapper.eq(ParamsConfigEO::getParamsManifestId, id);
@@ -165,7 +165,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
}
removeById(id);
return removeById(id);
}
/**
@@ -175,7 +175,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
public boolean deleteByIds(List<String> ids) {
// 关联删除配置
LambdaQueryWrapper<ParamsConfigEO> configEOQueryWrapper = new LambdaQueryWrapper<>();
@@ -191,7 +191,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
paramsCollectManifestEOService.deleteByIds(paramsCollectManifestIdList);
}
removeByIds(ids);
return removeByIds(ids);
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsExportTemplateEOController.java
+223
View File
@@ -0,0 +1,223 @@
package com.jero.modules.cert.report.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.modules.cert.report.entity.ParamsExportTemplateEO;
import com.jero.modules.cert.report.enums.ExportTemplateStateEnum;
import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
import com.jero.modules.system.util.StringUtils;
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.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="参数导出模板表")
@RestController
@RequestMapping("/report/exportTemplate")
@Slf4j
public class ParamsExportTemplateEOController extends JeroController<ParamsExportTemplateEO, IParamsExportTemplateEOService> {
@Autowired
private IParamsExportTemplateEOService paramsExportTemplateEOService;
/**
* 分页列表查询
*
* @param paramsExportTemplateEO
* @param pageNo
* @param pageSize
* @param cut
* @return
*/
@AutoLog(value = "参数导出模板表-分页列表查询")
@ApiOperation(value="参数导出模板表-分页列表查询", notes="参数导出模板表-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("report:exportTemplate:page")
public Result<?> queryPageList(ParamsExportTemplateEO paramsExportTemplateEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@RequestParam(name="cut") String cut) {
if (StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName())) {
paramsExportTemplateEO.setTemplateName(paramsExportTemplateEO.getTemplateName().replace("%", "\\%"));
}
LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.like(StringUtils.isNotEmpty(paramsExportTemplateEO.getTemplateName()), ParamsExportTemplateEO::getTemplateName, paramsExportTemplateEO.getTemplateName());
Page<ParamsExportTemplateEO> page = new Page<ParamsExportTemplateEO>(pageNo, pageSize);
IPage<ParamsExportTemplateEO> pageList = paramsExportTemplateEOService.page(page, queryWrapper);
List<ParamsExportTemplateEO> rows = pageList.getRecords();
Map<String, String> stateMap = ExportTemplateStateEnum.toMap(cut);
rows.forEach(exportTemplateEO -> {
exportTemplateEO.setState(stateMap.get(exportTemplateEO.getState()));
});
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "参数导出模板表-列表查询")
@ApiOperation(value="参数导出模板表-列表查询", notes="参数导出模板表-列表查询")
@GetMapping(value = "/list")
public Result<List<ParamsExportTemplateEO>> queryList() {
List<ParamsExportTemplateEO> list = paramsExportTemplateEOService.queryList();
return Result.OK(list);
}
/**
* 模板名称唯一校验
* true-唯一，false-不唯一
* @return
*/
@AutoLog(value = "参数导出模板表-模板名称唯一校验")
@ApiOperation(value="参数导出模板表-模板名称唯一校验", notes="参数导出模板表-模板名称唯一校验")
@GetMapping(value = "/verifyTemplateName")
// @RequiresPermissions("report:exportTemplate:add")
public Result<?> verifyTemplateName(@RequestParam(name="templateName") String templateName) {
boolean isRepeat = paramsExportTemplateEOService.verifyTemplateName(templateName);
return Result.OK(isRepeat);
}
/**
* 添加
*
* @param paramsExportTemplateEO
* @return
*/
@AutoLog(value = "参数导出模板表-添加")
@ApiOperation(value="参数导出模板表-添加", notes="参数导出模板表-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("report:exportTemplate:add")
public Result<?> add(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) {
boolean isSuccess = paramsExportTemplateEOService.add(paramsExportTemplateEO);
if (isSuccess) {
return Result.OK("添加成功！");
} else {
return Result.error("添加失败！");
}
}
/**
* 编辑
*
* @param paramsExportTemplateEO
* @return
*/
@AutoLog(value = "参数导出模板表-编辑")
@ApiOperation(value="参数导出模板表-编辑", notes="参数导出模板表-编辑")
@PostMapping(value = "/edit")
// @RequiresPermissions("report:exportTemplate:edit")
public Result<?> edit(@Validated @RequestBody ParamsExportTemplateEO paramsExportTemplateEO) {
boolean isSuccess = paramsExportTemplateEOService.editById(paramsExportTemplateEO);
if (isSuccess) {
return Result.OK("编辑成功！");
} else {
return Result.error("编辑失败！");
}
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "参数导出模板表-通过id删除")
@ApiOperation(value="参数导出模板表-通过id删除", notes="参数导出模板表-通过id删除")
@GetMapping(value = "/delete")
// @RequiresPermissions("report:exportTemplate:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
boolean isSuccess = paramsExportTemplateEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功！");
} else {
return Result.error("删除失败！");
}
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "参数导出模板表-批量删除")
@ApiOperation(value="参数导出模板表-批量删除", notes="参数导出模板表-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("report:exportTemplate:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
boolean isSuccess = paramsExportTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功！");
} else {
return Result.error("批量删除失败！");
}
}
/**
* 通过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) {
ParamsExportTemplateEO paramsExportTemplateEO = paramsExportTemplateEOService.queryById(id);
if(paramsExportTemplateEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(paramsExportTemplateEO);
}
/**
* 导出excel
*
* @param request
* @param paramsExportTemplateEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsExportTemplateEO paramsExportTemplateEO) {
return super.exportXls(request, paramsExportTemplateEO, ParamsExportTemplateEO.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, ParamsExportTemplateEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+81
View File
@@ -0,0 +1,81 @@
package com.jero.modules.cert.report.controller;
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.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="上报库参数项")
@RestController
@RequestMapping("/report/detail")
@Slf4j
public class ParamsReportDetailEOController extends JeroController<ParamsReportDetailEO, IParamsReportDetailEOService> {
@Autowired
private IParamsReportDetailEOService paramsReportDetailEOService;
/**
* 表头中英文切换
*
* @return
*/
@AutoLog(value = "上报库参数项-表头中英文切换")
@ApiOperation(value="上报库参数项-表头中英文切换", notes="上报库参数项-表头中英文切换")
@GetMapping(value = "/getHeader")
// @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
@RequestParam(name = "flag") String flag,
@RequestParam(name = "cut") String cut) {
List<Map<String, Object>> list = paramsReportDetailEOService.getHeader(paramsManifestId, flag, cut);
return Result.OK(list);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "上报库参数项-列表查询")
@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
@GetMapping(value = "/list")
// @RequiresPermissions("report:detail:list")
public Result<List<Map<String, Object>>> queryList(ParamsCollectManifestEO paramsCollectManifestEO,
@RequestParam(name = "cut") String cut) {
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) {
paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getParamsName())) {
paramsCollectManifestEO.setParamsName(paramsCollectManifestEO.getParamsName().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getSdt())) {
paramsCollectManifestEO.setSdt(paramsCollectManifestEO.getSdt().replace("%","\\%"));
}
if (StringUtils.isNotEmpty(paramsCollectManifestEO.getDre())) {
paramsCollectManifestEO.setDre(paramsCollectManifestEO.getDre().replace("%","\\%"));
}
List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsCollectManifestEO, cut);
return Result.OK(list);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+181
View File
@@ -0,0 +1,181 @@
package com.jero.modules.cert.report.controller;
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.modules.cert.report.entity.ParamsReportEO;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import com.jero.modules.system.util.StringUtils;
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.*;
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: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="上报库")
@RestController
@RequestMapping("/params/report")
@Slf4j
public class ParamsReportEOController extends JeroController<ParamsReportEO, IParamsReportEOService> {
@Autowired
private IParamsReportEOService paramsReportEOService;
/**
* 分页列表查询
*
* @param paramsReportEO
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "上报库-分页列表查询")
@ApiOperation(value="上报库-分页列表查询", notes="上报库-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("params:report:page")
public Result<?> queryPageList(ParamsReportEO paramsReportEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
if (StringUtils.isNotEmpty(paramsReportEO.getProjectName())) {
paramsReportEO.setProjectName(paramsReportEO.getProjectName().replace("%", "\\%"));
}
if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
paramsReportEO.setProjectName(paramsReportEO.getTitle().replace("%", "\\%"));
}
IPage page = new Page(pageNo, pageSize);
IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "上报库-列表查询")
@ApiOperation(value="上报库-列表查询", notes="上报库-列表查询")
@GetMapping(value = "/list")
public Result<List<ParamsReportEO>> queryList() {
List<ParamsReportEO> list = paramsReportEOService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param paramsReportEO
* @return
*/
@AutoLog(value = "上报库-添加")
@ApiOperation(value="上报库-添加", notes="上报库-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ParamsReportEO paramsReportEO) {
paramsReportEOService.add(paramsReportEO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param paramsReportEO
* @return
*/
@AutoLog(value = "上报库-编辑")
@ApiOperation(value="上报库-编辑", notes="上报库-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ParamsReportEO paramsReportEO) {
paramsReportEOService.editById(paramsReportEO);
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) {
paramsReportEOService.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.paramsReportEOService.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) {
ParamsReportEO paramsReportEO = paramsReportEOService.queryById(id);
if(paramsReportEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(paramsReportEO);
}
/**
* 导出excel
*
* @param request
* @param paramsReportEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ParamsReportEO paramsReportEO) {
return super.exportXls(request, paramsReportEO, ParamsReportEO.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, ParamsReportEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ReportCertCategoryParamsInfoEOController.java
+170
View File
@@ -0,0 +1,170 @@
package com.jero.modules.cert.report.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.system.base.controller.JeroController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Api(tags="上报库认证类别参数信息")
@RestController
@RequestMapping("/cert.report/reportCertCategoryParamsInfoEO")
@Slf4j
public class ReportCertCategoryParamsInfoEOController extends JeroController<ReportCertCategoryParamsInfoEO, IReportCertCategoryParamsInfoEOService> {
@Autowired
private IReportCertCategoryParamsInfoEOService reportCertCategoryParamsInfoEOService;
/**
* 分页列表查询
*
* @param reportCertCategoryParamsInfoEO
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-分页列表查询")
@ApiOperation(value="上报库认证类别参数信息-分页列表查询", notes="上报库认证类别参数信息-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ReportCertCategoryParamsInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(reportCertCategoryParamsInfoEO, req.getParameterMap());
Page<ReportCertCategoryParamsInfoEO> page = new Page<ReportCertCategoryParamsInfoEO>(pageNo, pageSize);
IPage<ReportCertCategoryParamsInfoEO> pageList = reportCertCategoryParamsInfoEOService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 列表查询
*
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-列表查询")
@ApiOperation(value="上报库认证类别参数信息-列表查询", notes="上报库认证类别参数信息-列表查询")
@GetMapping(value = "/list")
public Result<List<ReportCertCategoryParamsInfoEO>> queryList() {
List<ReportCertCategoryParamsInfoEO> list = reportCertCategoryParamsInfoEOService.queryList();
return Result.OK(list);
}
/**
* 添加
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-添加")
@ApiOperation(value="上报库认证类别参数信息-添加", notes="上报库认证类别参数信息-添加")
@PostMapping(value = "/add")
public Result<?> add(@Validated @RequestBody ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
reportCertCategoryParamsInfoEOService.add(reportCertCategoryParamsInfoEO);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@AutoLog(value = "上报库认证类别参数信息-编辑")
@ApiOperation(value="上报库认证类别参数信息-编辑", notes="上报库认证类别参数信息-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
reportCertCategoryParamsInfoEOService.editById(reportCertCategoryParamsInfoEO);
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) {
reportCertCategoryParamsInfoEOService.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.reportCertCategoryParamsInfoEOService.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) {
ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO = reportCertCategoryParamsInfoEOService.queryById(id);
if(reportCertCategoryParamsInfoEO==null) {
return Result.error("未找到对应数据");
}
return Result.OK(reportCertCategoryParamsInfoEO);
}
/**
* 导出excel
*
* @param request
* @param reportCertCategoryParamsInfoEO
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
return super.exportXls(request, reportCertCategoryParamsInfoEO, ReportCertCategoryParamsInfoEO.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, ReportCertCategoryParamsInfoEO.class);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsExportTemplateEO.java
+81
View File
@@ -0,0 +1,81 @@
package com.jero.modules.cert.report.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: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_export_template")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_export_template对象", description="参数导出模板表")
public class ParamsExportTemplateEO implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "最新变更时间")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**模板名称*/
@Excel(name = "模板名称", width = 15)
@ApiModelProperty(value = "模板名称")
private String templateName;
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
private String state;
/**内容说明*/
@Excel(name = "内容说明", width = 15)
@ApiModelProperty(value = "内容说明")
private String description;
/**附件上传*/
@Excel(name = "附件上传", width = 15)
@ApiModelProperty(value = "附件上传")
private String fileConnectId;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigDataEO.java
+27
View File
@@ -0,0 +1,27 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report_config_data")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_config_data对象", description="上报库参数配置数据")
public class ParamsReportConfigDataEO extends ParamsConfigDataEO implements Serializable {
private static final long serialVersionUID = 1L;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportConfigEO.java
+27
View File
@@ -0,0 +1,27 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.cert.collect.entity.ParamsConfigEO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report_config")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_config对象", description="上报库参数配置")
public class ParamsReportConfigEO extends ParamsConfigEO implements Serializable {
private static final long serialVersionUID = 1L;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportDetailEO.java
+38
View File
@@ -0,0 +1,38 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
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: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report_detail")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report_detail对象", description="上报库参数项")
public class ParamsReportDetailEO extends ParamsCollectManifestEO implements Serializable {
// private static final long serialVersionUID = 1L;
/**同步时间*/
@Excel(name = "同步时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "同步时间")
private java.util.Date syncTime;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
+78
View File
@@ -0,0 +1,78 @@
package com.jero.modules.cert.report.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: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("params_report")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="params_report对象", description="上报库")
public class ParamsReportEO 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 oldParamsManifestId;
@ApiModelProperty(value = "版本")
private Integer version;
@TableField(exist = false)
@ApiModelProperty(value = "项目名称")
private String projectName;
@TableField(exist = false)
@ApiModelProperty(value = "清单标题")
private String title;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
+27
View File
@@ -0,0 +1,27 @@
package com.jero.modules.cert.report.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Data
@TableName("report_cert_category_params_info")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="report_cert_category_params_info对象", description="上报库认证类别参数信息")
public class ReportCertCategoryParamsInfoEO extends CertCategoryParamsInfoEO implements Serializable {
private static final long serialVersionUID = 1L;
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/enums/ExportTemplateStateEnum.java
+64
View File
@@ -0,0 +1,64 @@
package com.jero.modules.cert.report.enums;
import com.jero.common.constant.enums.CutEnum;
import java.util.HashMap;
import java.util.Map;
/**
* @Author: liyawei
* @Description:
* @Date: Created in 11:29 2022/5/18
*/
public enum ExportTemplateStateEnum {
ENABLE("启用","0","enable"),
DISABLE("禁用","1","disable");
String name;
String value;
String enName;
ExportTemplateStateEnum(String name, String value, String enName) {
this.name = name;
this.value = value;
this.enName = enName;
}
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 String getEnName() {
return enName;
}
public void setEnName(String enName) {
this.enName = enName;
}
public static Map<String,String> toMap(String cut){
Map<String,String> map = new HashMap<>();
if (CutEnum.CN.getValue().equals(cut)) {
for (ExportTemplateStateEnum exportTemplateStateEnum : ExportTemplateStateEnum.values()) {
map.put(exportTemplateStateEnum.getValue(), exportTemplateStateEnum.getName());
}
} else if (CutEnum.EN.getValue().equals(cut)) {
for (ExportTemplateStateEnum exportTemplateStateEnum : ExportTemplateStateEnum.values()) {
map.put(exportTemplateStateEnum.getValue(), exportTemplateStateEnum.getEnName());
}
}
return map;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsExportTemplateEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsExportTemplateEOMapper extends BaseMapper<ParamsExportTemplateEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigDataEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportConfigDataEOMapper extends BaseMapper<ParamsReportConfigDataEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportConfigEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportConfigEOMapper extends BaseMapper<ParamsReportConfigEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+19
View File
@@ -0,0 +1,19 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetailEO> {
List<ParamsReportDetailEO> listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportEOMapper.java
+18
View File
@@ -0,0 +1,18 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ParamsReportEOMapper extends BaseMapper<ParamsReportEO> {
IPage pageInfo(@Param("page") IPage page, @Param("paramsReportEO") ParamsReportEO paramsReportEO);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ReportCertCategoryParamsInfoEOMapper.java
+14
View File
@@ -0,0 +1,14 @@
package com.jero.modules.cert.report.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface ReportCertCategoryParamsInfoEOMapper extends BaseMapper<ReportCertCategoryParamsInfoEO> {
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsExportTemplateEOMapper.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper">
<resultMap id="ParamsExportTemplateEOResultMap" type="com.jero.modules.cert.report.entity.ParamsExportTemplateEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="template_name" property="templateName" />
<result column="state" property="state" />
<result column="description" property="description" />
<result column="file_connect_id" property="fileConnectId" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigDataEOMapper.xml
+17
View File
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper">
<resultMap id="ParamsReportConfigDataEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportConfigDataEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="text_data" property="textData" />
<result column="pull_data" property="pullData" />
<result column="file_connect_id" property="fileConnectId" />
<result column="params_config_id" property="paramsConfigId" />
<result column="params_collect_manifest_id" property="paramsCollectManifestId" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportConfigEOMapper.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper">
<resultMap id="ParamsReportConfigEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportConfigEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="config_name" property="configName" />
<result column="car_type" property="carType" />
<result column="version" property="version" />
<result column="battery" property="battery" />
<result column="motor" property="motor" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="is_lock" property="isLock" />
<result column="display_seq" property="displaySeq" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+64
View File
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper">
<resultMap id="ParamsReportDetailEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportDetailEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="cert_category" property="certCategory" />
<result column="nio_number" property="nioNumber" />
<result column="is_must" property="isMust" />
<result column="params_name" property="paramsName" />
<result column="technology_territory" property="technologyTerritory" />
<result column="params_batch" property="paramsBatch" />
<result column="duty_territory" property="dutyTerritory" />
<result column="description" property="description" />
<result column="control_type" property="controlType" />
<result column="control_values" property="controlValues" />
<result column="control_verify" property="controlVerify" />
<result column="file_template" property="fileTemplate" />
<result column="params_template_id" property="paramsTemplateId" />
<result column="state" property="state" />
<result column="sdt" property="sdt" />
<result column="dre" property="dre" />
<result column="deadline" property="deadline" />
<result column="params_manifest_id" property="paramsManifestId" />
<result column="sync_time" property="syncTime" />
</resultMap>
<sql id="BaseQuerySql">
<where>
<if test="paramsCollectManifestEO != null">
<if test="paramsCollectManifestEO.nioNumber !=null and paramsCollectManifestEO.nioNumber !=''">
AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%')
</if>
<if test="paramsCollectManifestEO.paramsName !=null and paramsCollectManifestEO.paramsName !=''">
AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%')
</if>
<if test="paramsCollectManifestEO.certCategory !=null and paramsCollectManifestEO.certCategory !=''">
AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%')
</if>
<if test="paramsCollectManifestEO.sdt !=null and paramsCollectManifestEO.sdt !=''">
AND sdt LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.sdt}),'%')
</if>
<if test="paramsCollectManifestEO.dre !=null and paramsCollectManifestEO.dre !=''">
AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%')
</if>
<if test="paramsCollectManifestEO.paramsManifestId !=null and paramsCollectManifestEO.paramsManifestId !=''">
AND params_manifest_id = #{paramsCollectManifestEO.paramsManifestId}
</if>
</if>
</where>
</sql>
<select id="listInfo" resultMap="ParamsReportDetailEOResultMap">
select *
from params_report_detail
<include refid="BaseQuerySql"/>
order by create_time asc
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportEOMapper.xml
+49
View File
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ParamsReportEOMapper">
<resultMap id="ParamsReportEOResultMap" type="com.jero.modules.cert.report.entity.ParamsReportEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="title" property="title" />
<result column="version" property="version" />
<result column="project_name" property="projectName" />
<result column="old_params_manifest_id" property="oldParamsManifestId" />
</resultMap>
<sql id="BaseColumnList">
pr.id as id,
pr.old_params_manifest_id as old_params_manifest_id,
pr.version as version,
pm.title as title,
pni.project_name as project_name
</sql>
<sql id="BaseQuerySql">
<where>
<if test="paramsReportEO != null">
<if test="paramsReportEO.title !=null and paramsReportEO.title !=''">
AND title LIKE CONCAT(CONCAT('%',#{paramsReportEO.paramsManifestTitle}),'%')
</if>
<if test="paramsReportEO.projectName !=null and paramsReportEO.projectName !=''">
AND project_name LIKE CONCAT(CONCAT('%',#{paramsReportEO.projectName}),'%')
</if>
</if>
</where>
</sql>
<select id="pageInfo" resultMap="ParamsReportEOResultMap">
select tmp_tb.* from(
select <include refid="BaseColumnList"/>
from params_report pr
left join params_manifest as pm on pm.id = pr.old_params_manifest_id
left join project_library_base as plb on plb.id = pm.project_id
left join project_name_info as pni on plb.project_name_id = pni.id
) tmp_tb
<include refid="BaseQuerySql"/>
</select>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.modules.cert.report.mapper.ReportCertCategoryParamsInfoEOMapper">
<resultMap id="ReportCertCategoryParamsInfoEOResultMap" type="com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO">
<id column="id" property="id" />
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="sys_org_code" property="sysOrgCode" />
<result column="params_number" property="paramsNumber" />
<result column="params_name" property="paramsName" />
<result column="description" property="description" />
<result column="nio_number" property="nioNumber" />
<result column="cert_category" property="certCategory" />
<result column="params_template_id" property="paramsTemplateId" />
<result column="version" property="version" />
</resultMap>
</mapper>
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsExportTemplateEOService.java
+63
View File
@@ -0,0 +1,63 @@
package com.jero.modules.cert.report.service;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsExportTemplateEOService extends IService<ParamsExportTemplateEO> {
/**
* 保存
*
* @param paramsExportTemplateEO
* @return
*/
boolean add(ParamsExportTemplateEO paramsExportTemplateEO);
/**
* 更新
*
* @param paramsExportTemplateEO
* @return
*/
boolean editById(ParamsExportTemplateEO paramsExportTemplateEO);
/**
* 通过id删除
*
* @param id
* @return
*/
boolean deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsExportTemplateEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ParamsExportTemplateEO> queryList();
boolean verifyTemplateName(String templateName);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigDataEOService.java
+22
View File
@@ -0,0 +1,22 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportConfigDataEOService extends IService<ParamsReportConfigDataEO> {
/**
* 通过id查询
*
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportConfigEOService.java
+16
View File
@@ -0,0 +1,16 @@
package com.jero.modules.cert.report.service;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportConfigEOService extends IService<ParamsReportConfigEO> {
List<ParamsReportConfigEO> queryList(String paramsManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import java.util.List;
import java.util.Map;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportDetailEOService extends IService<ParamsReportDetailEO> {
/**
* 列表查询
* @param paramsCollectManifestEO
* @param cut
* @return
*/
List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut);
/**
* 列表表头中英文切换
* @param paramsManifestId
* @param flag
* @param cut
* @return
*/
List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IParamsReportEOService.java
+70
View File
@@ -0,0 +1,70 @@
package com.jero.modules.cert.report.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import java.util.List;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IParamsReportEOService extends IService<ParamsReportEO> {
/**
* 保存
*
* @param paramsReportEO
* @return
*/
void add(ParamsReportEO paramsReportEO);
/**
* 更新
*
* @param paramsReportEO
* @return
*/
void editById(ParamsReportEO paramsReportEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ParamsReportEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ParamsReportEO> queryList();
IPage pageInfo(IPage page, ParamsReportEO paramsReportEO);
boolean isSync(String oldParamsManifestId);
ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/IReportCertCategoryParamsInfoEOService.java
+61
View File
@@ -0,0 +1,61 @@
package com.jero.modules.cert.report.service;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
public interface IReportCertCategoryParamsInfoEOService extends IService<ReportCertCategoryParamsInfoEO> {
/**
* 保存
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
void add(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO);
/**
* 更新
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
void editById(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO);
/**
* 通过id删除
*
* @param id
* @return
*/
void deleteById(String id);
/**
* 批量删除
*
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
/**
* 通过id查询
*
* @param id
* @return
*/
ReportCertCategoryParamsInfoEO queryById(String id);
/**
* 列表查询
*
* @return
*/
List<ReportCertCategoryParamsInfoEO> queryList();
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsExportTemplateEOServiceImpl.java
+145
View File
@@ -0,0 +1,145 @@
package com.jero.modules.cert.report.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsExportTemplateEO;
import com.jero.modules.cert.report.mapper.ParamsExportTemplateEOMapper;
import com.jero.modules.cert.report.service.IParamsExportTemplateEOService;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.UUID;
/**
* @Description: 参数导出模板表
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsExportTemplateEOServiceImpl extends ServiceImpl<ParamsExportTemplateEOMapper, ParamsExportTemplateEO> implements IParamsExportTemplateEOService {
@Autowired
private IOSSFileService ossFileService;
/**
* 保存
*
* @param paramsExportTemplateEO
* @return
*/
@Override
public boolean add(ParamsExportTemplateEO paramsExportTemplateEO) {
// 处理附件模板 修改文件表关联信息connect_id 一个文件
if (StringUtils.isNotBlank(paramsExportTemplateEO.getFileConnectId())) {
String fileId = paramsExportTemplateEO.getFileConnectId();
OSSFile targetOSSFile = ossFileService.getById(fileId);
if (ObjectUtil.isNotEmpty(targetOSSFile)) {
String connectId = UUID.randomUUID().toString().replace("-", "");
OSSFile ossFile = new OSSFile();
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
ossFileService.updateById(ossFile);
paramsExportTemplateEO.setFileConnectId(connectId);
} else {
paramsExportTemplateEO.setFileConnectId(null);
}
}
Date now = new Date();
paramsExportTemplateEO.setCreateTime(now);
paramsExportTemplateEO.setUpdateTime(now);
return save(paramsExportTemplateEO);
}
/**
* 更新
*
* @param paramsExportTemplateEO
* @return
*/
@Override
public boolean editById(ParamsExportTemplateEO paramsExportTemplateEO) {
// 处理附件模板 若附件模板被修改，修改文件表关联信息connect_id 一个文件
if (StringUtils.isNotBlank(paramsExportTemplateEO.getFileConnectId())) {
String fileId = paramsExportTemplateEO.getFileConnectId();
OSSFile targetOSSFile = ossFileService.getById(fileId);
if (ObjectUtil.isNotEmpty(targetOSSFile)) { // 附件模板被修改，传的fileId
String connectId = UUID.randomUUID().toString().replace("-", "");
OSSFile ossFile = new OSSFile();
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
ossFileService.updateById(ossFile);
paramsExportTemplateEO.setFileConnectId(connectId);
}
}
Date now = new Date();
paramsExportTemplateEO.setUpdateTime(now);
return updateById(paramsExportTemplateEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public boolean deleteById(String id) {
return removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public boolean deleteByIds(List<String> ids) {
// TODO 关联删除文件信息
return removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ParamsExportTemplateEO queryById(String id) {
// TODO 关联删除文件信息
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsExportTemplateEO> queryList() {
return list();
}
@Override
public boolean verifyTemplateName(String templateName) {
LambdaQueryWrapper<ParamsExportTemplateEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsExportTemplateEO::getTemplateName, templateName);
int repeatNum = count(queryWrapper);
if (repeatNum > 0) {
return false;
} else {
return true;
}
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
import com.jero.modules.cert.report.mapper.ParamsReportConfigDataEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
import org.springframework.stereotype.Service;
/**
* @Description: 上报库参数配置数据
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsReportConfigDataEOMapper, ParamsReportConfigDataEO> implements IParamsReportConfigDataEOService {
/**
* 通过id查询
*
* @param paramsConfigId
* @param paramsCollectManifestId
* @return
*/
@Override
public ParamsReportConfigDataEO queryByConfigIdAndCollectManifestId(String paramsConfigId, String paramsCollectManifestId) {
LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId);
queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
getOne(queryWrapper);
return getOne(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigEOServiceImpl.java
+34
View File
@@ -0,0 +1,34 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.jero.modules.cert.report.mapper.ParamsReportConfigEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 上报库参数配置
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportConfigEOServiceImpl extends ServiceImpl<ParamsReportConfigEOMapper, ParamsReportConfigEO> implements IParamsReportConfigEOService {
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsReportConfigEO> queryList(String paramsManifestId) {
LambdaQueryWrapper<ParamsReportConfigEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportConfigEO::getParamsManifestId, paramsManifestId);
queryWrapper.orderByAsc(ParamsReportConfigEO::getDisplaySeq);
List<ParamsReportConfigEO> list = list(queryWrapper);
return list;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+410
View File
@@ -0,0 +1,410 @@
package com.jero.modules.cert.report.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.enums.CutEnum;
import com.jero.common.constant.enums.YesOrNoEnum;
import com.jero.generater.modules.online.cgform.entity.OnlCgformField;
import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl;
import com.jero.modules.cert.collect.entity.*;
import com.jero.modules.cert.collect.enums.CollectManifestStateEnum;
import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum;
import com.jero.modules.cert.collect.vo.ParamsConfigDataVO;
import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
import com.jero.modules.cert.report.mapper.ParamsReportDetailEOMapper;
import com.jero.modules.cert.report.service.IParamsReportConfigDataEOService;
import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
import com.jero.modules.cert.report.service.IParamsReportDetailEOService;
import com.jero.modules.cert.template.enums.ControlTypeEnum;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.ISysDictItemService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 上报库参数项
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDetailEOMapper, ParamsReportDetailEO> implements IParamsReportDetailEOService {
@Autowired
private ParamsReportDetailEOMapper paramsReportDetailEOMapper;
@Autowired
private OnlCgformFieldServiceImpl onlCgformFieldService;
@Autowired
private IParamsReportConfigEOService paramsReportConfigEOService;
@Autowired
private IParamsReportConfigDataEOService paramsReportConfigDataEOService;
@Autowired
private ISysDictItemService sysDictItemService;
/**
* 列表查询
*
* @return
*/
@Override
public List<Map<String, Object>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) {
String paramsManifestId = paramsCollectManifestEO.getParamsManifestId();
List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
// 普通数据字典
List<SysDictItem> dictItemList = new ArrayList<>();
List<String> dictCodeList = new ArrayList<>();
dictCodeList.add("duty_territory");
dictCodeList.add("cert_category");
for (String dictCode : dictCodeList) {
List<SysDictItem> dictItems = sysDictItemService.selectItemsByDictCode(dictCode);
dictItemList.addAll(dictItems);
}
List<Map<String, Object>> listMap = new ArrayList<>();
list.forEach(collectManifestEO -> { // 参数收集清单
// 处理数据字典字段 中英文切换 认证类型，责任领域
List<String> certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(","));
List<String> dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(","));
String certCategoryName = "";
String dutyTerritoryName = "";
if (CutEnum.CN.getValue().equals(cut)) {
certCategoryName = dictItemList.stream()
.filter(e -> certCategory.contains(e.getItemValue()))
.map(SysDictItem::getItemText)
.collect(Collectors.joining(","));
dutyTerritoryName = dictItemList.stream()
.filter(e -> dutyTerritory.contains(e.getItemValue()))
.map(SysDictItem::getItemText)
.collect(Collectors.joining(","));
} else if (CutEnum.EN.getValue().equals(cut)) {
certCategoryName = dictItemList.stream()
.filter(e -> certCategory.contains(e.getItemValue()))
.map(SysDictItem::getEnName)
.collect(Collectors.joining(","));
dutyTerritoryName = dictItemList.stream()
.filter(e -> dutyTerritory.contains(e.getItemValue()))
.map(SysDictItem::getEnName)
.collect(Collectors.joining(","));
}
// String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut);
collectManifestEO.setCertCategory(certCategoryName);
// String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut);
collectManifestEO.setDutyTerritory(dutyTerritoryName);
// 处理状态字段
Map<String, String> collectManifestStateMap = CollectManifestStateEnum.toMap(cut);
String stateName = collectManifestStateMap.get(collectManifestEO.getState());
collectManifestEO.setState(stateName);
Map<String, Object> manifestMap = objectToMap(collectManifestEO); // 对象转map
String controlType = collectManifestEO.getControlType();
String paramsCollectManifestId = collectManifestEO.getId();
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
Map<String, Object> configMap = new HashMap<>();
String paramsConfigId = paramsConfigEO.getId();
ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
List<ParamsConfigDataVO> paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据
configMap.put("controlType", controlType);
configMap.put("list", paramsConfigDataVOList);
manifestMap.put(paramsConfigEO.getId(), configMap);
});
}
listMap.add(manifestMap);
});
return listMap;
}
/**
* 重新组装配置数据 用于返回前端
* @param controlType
* @param paramsConfigDataEO
* @param paramsCollectManifestEO
* @return
*/
private List<ParamsConfigDataVO> getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) {
List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
configDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.FILE.getValue().equals(controlType)) {
ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(configDataVO);
} else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullConfigDataVO);
} else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullMoreConfigDataVO);
} else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
} else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
} else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
pullMoreConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullMoreConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
} else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
textConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData());
}
paramsConfigDataVOList.add(textConfigDataVO);
ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
pullConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData());
}
paramsConfigDataVOList.add(pullConfigDataVO);
ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
fileConfigDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId());
}
paramsConfigDataVOList.add(fileConfigDataVO);
}
return paramsConfigDataVOList;
}
private List<Map<String, String>> getControlValueMapList(String controlValue) {
List<Map<String, String>> controlValueMapList = new ArrayList<>();
if (StringUtils.isNotEmpty(controlValue)) {
controlValue = controlValue.replace("，", ",");
String[] controlValueStr = controlValue.split(",");
for (int i = 0; i < controlValueStr.length; i++) {
Map<String, String> controlValueMap = new HashMap<>();
controlValueMap.put("lable", controlValueStr[i]);
controlValueMap.put("value", controlValueStr[i]);
controlValueMapList.add(controlValueMap);
}
}
return controlValueMapList;
}
/**
* 列表表头中英文切换
*
* @return
*/
@Override
public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut) {
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // flag--->8
if (fieldList.size() != 0) {
//过滤列表字段(is_show_list-->列表是否显示0否 1是)
fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
}
List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId);
List<Map<String, Object>> listConfig = new LinkedList<>();
for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
Map<String, Object> map = new HashMap<>();
map.put("db_field_name", paramsConfigEO.getId());
map.put("db_field_txt", paramsConfigEO.getConfigName());
map.put("type", true); //配置列 标识
listConfig.add(map);
}
List<Map<String, Object>> list = new LinkedList<>();
int indexOfDescription = 1; // 参数说明的位置
for (int i = 0; i < fieldList.size(); i++) {
OnlCgformField onlCgformField = fieldList.get(i);
Map<String, Object> map = new HashMap<>();
String dbFieldName = onlCgformField.getDbFieldName();
if ("description".equals(dbFieldName)) {
indexOfDescription = i;
}
if ("sdt".equals(dbFieldName)) {
map.put("click", true);
}
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
if(CutEnum.CN.getValue().equals(cut)){
map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
}else{
map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
}
list.add(map);
}
list.addAll(indexOfDescription+1, listConfig);
return list;
}
/**
* 实体对象转成Map
* @param obj 实体对象
* @return
*/
private Map<String, Object> objectToMap(Object obj) {
Map<String, Object> map = new HashMap<>();
if (obj == null) {
return map;
}
Class clazz = obj.getClass();
Field[] fields = clazz.getDeclaredFields();
try {
for (Field field : fields) {
field.setAccessible(true);
map.put(field.getName(), field.get(obj));
}
} catch (Exception e) {
e.printStackTrace();
}
return map;
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java
+121
View File
@@ -0,0 +1,121 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ParamsReportEO;
import com.jero.modules.cert.report.mapper.ParamsReportEOMapper;
import com.jero.modules.cert.report.service.IParamsReportEOService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Description: 上报库
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ParamsReportEOServiceImpl extends ServiceImpl<ParamsReportEOMapper, ParamsReportEO> implements IParamsReportEOService {
@Autowired
private ParamsReportEOMapper paramsReportEOMapper;
/**
* 保存
*
* @param paramsReportEO
* @return
*/
@Override
public void add(ParamsReportEO paramsReportEO) {
Date now = new Date();
paramsReportEO.setCreateTime(now);
paramsReportEO.setUpdateTime(now);
save(paramsReportEO);
}
/**
* 更新
*
* @param paramsReportEO
* @return
*/
@Override
public void editById(ParamsReportEO paramsReportEO) {
Date now = new Date();
paramsReportEO.setUpdateTime(now);
saveOrUpdate(paramsReportEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ParamsReportEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ParamsReportEO> queryList() {
return list();
}
@Override
public IPage pageInfo(IPage page, ParamsReportEO paramsReportEO) {
return paramsReportEOMapper.pageInfo(page, paramsReportEO);
}
@Override
public boolean isSync(String oldParamsManifestId) {
LambdaQueryWrapper<ParamsReportEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId);
int num = count(queryWrapper);
if (num > 0) {
return true; // 上报过
} else {
return false; // 没上报过
}
}
@Override
public ParamsReportEO queryByOldParamsManifestId(String oldParamsManifestId) {
LambdaQueryWrapper<ParamsReportEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, oldParamsManifestId);
return getOne(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ReportCertCategoryParamsInfoEOServiceImpl.java
+90
View File
@@ -0,0 +1,90 @@
package com.jero.modules.cert.report.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.report.entity.ReportCertCategoryParamsInfoEO;
import com.jero.modules.cert.report.mapper.ReportCertCategoryParamsInfoEOMapper;
import com.jero.modules.cert.report.service.IReportCertCategoryParamsInfoEOService;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* @Description: 上报库认证类别参数信息
* @Author: jero-boot
* @Date: 2022-05-18
* @Version: V1.0
*/
@Service
public class ReportCertCategoryParamsInfoEOServiceImpl extends ServiceImpl<ReportCertCategoryParamsInfoEOMapper, ReportCertCategoryParamsInfoEO> implements IReportCertCategoryParamsInfoEOService {
/**
* 保存
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@Override
public void add(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
Date now = new Date();
reportCertCategoryParamsInfoEO.setCreateTime(now);
reportCertCategoryParamsInfoEO.setUpdateTime(now);
save(reportCertCategoryParamsInfoEO);
}
/**
* 更新
*
* @param reportCertCategoryParamsInfoEO
* @return
*/
@Override
public void editById(ReportCertCategoryParamsInfoEO reportCertCategoryParamsInfoEO) {
Date now = new Date();
reportCertCategoryParamsInfoEO.setUpdateTime(now);
saveOrUpdate(reportCertCategoryParamsInfoEO);
}
/**
* 通过id删除
*
* @param id
* @return
*/
@Override
public void deleteById(String id) {
removeById(id);
}
/**
* 批量删除
*
* @param ids
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
}
/**
* 通过id查询
*
* @param id
* @return
*/
@Override
public ReportCertCategoryParamsInfoEO queryById(String id) {
return getById(id);
}
/**
* 列表查询
*
* @return
*/
@Override
public List<ReportCertCategoryParamsInfoEO> queryList() {
return list();
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+10 -8
View File
@@ -170,11 +170,12 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@GetMapping(value = "/delete")
@RequiresPermissions("params:paramsInfo:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
if (StringUtils.isBlank(id)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsInfoEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功!");
} else {
return Result.error("删除失败！");
}
paramsInfoEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
@@ -188,11 +189,12 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
@PostMapping(value = "/deleteBatch")
@RequiresPermissions("params:paramsInfo:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if (StringUtils.isBlank(ids)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功!");
} else {
return Result.error("批量删除失败！");
}
this.paramsInfoEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java
+22 -12
View File
@@ -95,8 +95,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@PostMapping(value = "/add")
@RequiresPermissions("params:template:add")
public Result<?> add(@Validated @RequestBody ParamsTemplateEO paramsTemplateEO) {
paramsTemplateEOService.add(paramsTemplateEO);
return Result.OK("添加成功！");
boolean isSuccess = paramsTemplateEOService.add(paramsTemplateEO);
if (isSuccess) {
return Result.OK("添加成功！");
} else {
return Result.error("添加失败！");
}
}
/**
@@ -110,8 +114,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@PutMapping(value = "/edit")
@RequiresPermissions("params:template:edit")
public Result<?> edit(@Validated @RequestBody ParamsTemplateEO paramsTemplateEO) {
paramsTemplateEOService.editById(paramsTemplateEO);
return Result.OK("编辑成功!");
boolean isSuccess = paramsTemplateEOService.editById(paramsTemplateEO);
if (isSuccess) {
return Result.OK("编辑成功!");
} else {
return Result.error("编辑失败！");
}
}
/**
@@ -125,11 +133,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@GetMapping(value = "/delete")
@RequiresPermissions("params:template:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
if (StringUtils.isBlank(id)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsTemplateEOService.deleteById(id);
if (isSuccess) {
return Result.OK("删除成功!");
} else {
return Result.error("删除失败！");
}
paramsTemplateEOService.deleteById(id);
return Result.OK("删除成功!");
}
/**
@@ -143,11 +152,12 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
@PostMapping(value = "/deleteBatch")
@RequiresPermissions("params:template:deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if (StringUtils.isBlank(ids)) {
return Result.error("删除数据不能为空");
boolean isSuccess = paramsTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
if (isSuccess) {
return Result.OK("批量删除成功!");
} else {
return Result.error("批量删除失败！");
}
this.paramsTemplateEOService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/ICertCategoryParamsInfoPublishEOService.java
+4 -1
View File
@@ -1,7 +1,8 @@
package com.jero.modules.cert.template.service;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import java.util.List;
/**
@@ -58,4 +59,6 @@ public interface ICertCategoryParamsInfoPublishEOService extends IService<CertCa
* @return
*/
List<CertCategoryParamsInfoPublishEO> queryList();
List<CertCategoryParamsInfoPublishEO> queryListByVersionAndNio(String paramsTemplateId, Integer version, List<String> nioNumberList);
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java
+2 -2
View File
@@ -44,7 +44,7 @@ public interface IParamsInfoEOService extends IService<ParamsInfoEO> {
* @param id
* @return
*/
void deleteById(String id);
boolean deleteById(String id);
/**
* 批量删除
@@ -52,7 +52,7 @@ public interface IParamsInfoEOService extends IService<ParamsInfoEO> {
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsTemplateEOService.java
+4 -4
View File
@@ -19,7 +19,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param paramsTemplateEO
* @return
*/
void add(ParamsTemplateEO paramsTemplateEO);
boolean add(ParamsTemplateEO paramsTemplateEO);
/**
* 更新
@@ -27,7 +27,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param paramsTemplateEO
* @return
*/
void editById(ParamsTemplateEO paramsTemplateEO);
boolean editById(ParamsTemplateEO paramsTemplateEO);
/**
* 通过id删除
@@ -35,7 +35,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param id
* @return
*/
void deleteById(String id);
boolean deleteById(String id);
/**
* 批量删除
@@ -43,7 +43,7 @@ public interface IParamsTemplateEOService extends IService<ParamsTemplateEO> {
* @param ids
* @return
*/
void deleteByIds(List<String> ids);
boolean deleteByIds(List<String> ids);
/**
* 通过id查询
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/CertCategoryParamsInfoPublishEOServiceImpl.java
+11
View File
@@ -1,5 +1,6 @@
package com.jero.modules.cert.template.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.modules.cert.template.entity.CertCategoryParamsInfoPublishEO;
import com.jero.modules.cert.template.mapper.CertCategoryParamsInfoPublishEOMapper;
@@ -87,4 +88,14 @@ public class CertCategoryParamsInfoPublishEOServiceImpl extends ServiceImpl<Cert
public List<CertCategoryParamsInfoPublishEO> queryList() {
return list();
}
@Override
public List<CertCategoryParamsInfoPublishEO> queryListByVersionAndNio(String paramsTemplateId, Integer version, List<String> nioNumberList) {
LambdaQueryWrapper<CertCategoryParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CertCategoryParamsInfoPublishEO::getParamsTemplateId, paramsTemplateId);
queryWrapper.eq(CertCategoryParamsInfoPublishEO::getVersion, version);
queryWrapper.in(CertCategoryParamsInfoPublishEO::getNioNumber, nioNumberList);
return list(queryWrapper);
}
}
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+4 -4
View File
@@ -208,14 +208,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
* @return
*/
@Override
public void deleteById(String id) {
public boolean deleteById(String id) {
// 关联删除认证类别参数项
ParamsInfoEO paramsInfoEO = getById(id);
String nioNumber = paramsInfoEO.getNioNumber();
String paramsTemplateId = paramsInfoEO.getParamsTemplateId();
certCategoryParamsInfoEOService.deleteByNioNumberList(Arrays.asList(nioNumber), paramsTemplateId);
// TODO 关联删除附件模板文件信息和文件
removeById(id);
return removeById(id);
}
/**
@@ -225,7 +225,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
public boolean deleteByIds(List<String> ids) {
LambdaQueryWrapper<ParamsInfoEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(ParamsInfoEO::getId, ids);
List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
@@ -237,7 +237,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
// TODO 关联删除附件模板文件信息和文件
}
removeByIds(ids);
return removeByIds(ids);
}
/**
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java
+8 -8
View File
@@ -42,14 +42,14 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void add(ParamsTemplateEO paramsTemplateEO) {
public boolean add(ParamsTemplateEO paramsTemplateEO) {
paramsTemplateEO.setId(UUID.randomUUID().toString().replace("-",""));
Date now = new Date();
// 设置默认版本0
paramsTemplateEO.setVersion(0);
paramsTemplateEO.setCreateTime(now);
paramsTemplateEO.setUpdateTime(now);
save(paramsTemplateEO);
return save(paramsTemplateEO);
}
/**
@@ -59,10 +59,10 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void editById(ParamsTemplateEO paramsTemplateEO) {
public boolean editById(ParamsTemplateEO paramsTemplateEO) {
Date now = new Date();
paramsTemplateEO.setUpdateTime(now);
updateById(paramsTemplateEO);
return updateById(paramsTemplateEO);
// saveOrUpdate(paramsTemplateEO);
}
@@ -73,11 +73,11 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void deleteById(String id) {
public boolean deleteById(String id) {
// 关联删除参数项
certCategoryParamsInfoEOService.deleteByParamsTemplateIds(id);
paramsInfoEOService.deleteByParamsTemplateIds(id);
removeById(id);
return removeById(id);
}
/**
@@ -87,11 +87,11 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl<ParamsTemplateEOMap
* @return
*/
@Override
public void deleteByIds(List<String> ids) {
public boolean deleteByIds(List<String> ids) {
// 关联删除参数项
certCategoryParamsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ","));
paramsInfoEOService.deleteByParamsTemplateIds(StringUtils.join(ids, ","));
removeByIds(ids);
return removeByIds(ids);
}
/**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+21 -6
View File
@@ -428,6 +428,22 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
public void disposeData(List<DummyInventoryInfoEO> records) {
Set<String> technologyTerritorySet = new HashSet<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : records) {
//子标题
if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) {
dummyInventoryInfoEO.setSubtitle("空");
}
//WVTA ID
if (StringUtils.isBlank(dummyInventoryInfoEO.getWvtaId())) {
dummyInventoryInfoEO.setWvtaId("空");
}
//备注
if (StringUtils.isBlank(dummyInventoryInfoEO.getRemark())) {
dummyInventoryInfoEO.setRemark("空");
}
//适用增补件
if (StringUtils.isBlank(dummyInventoryInfoEO.getApplicableSupplement())) {
dummyInventoryInfoEO.setApplicableSupplement("空");
}
//技术领域
if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) {
List<String> list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(","));
@@ -540,7 +556,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
dummyInventoryInfoEO.setImplementTimeString("空");
}
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
@@ -685,13 +700,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//设置维护清单的新增消息
if (StringUtils.isNotBlank(addSerialNumber)) {
contentInfo += row + ". " + "This virtual list has been added serial number : " + addSerialNumber + ".\r\n";
contentInfo += row + ". " + "This virtual list has been added Number : " + addSerialNumber + ".\r\n";
row++;
}
//设置维护清单的删除消息
if (StringUtils.isNotBlank(deleteSerialNumber)) {
contentInfo += row + ". " + "This virtual list has been deleted serial number : " + deleteSerialNumber + ".\r\n";
contentInfo += row + ". " + "This virtual list has been deleted Number : " + deleteSerialNumber + ".\r\n";
row++;
}
@@ -700,7 +715,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
for (Map<String, String> infoDiff : infoDiffList) {
if (infoDiff.size() > 1) {
int infoDiffRow = 1;
contentInfo += row + ". The serial Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n";
//标题
if (StringUtils.isNotBlank(infoDiff.get("title"))) {
List<String> list = Arrays.asList(infoDiff.get("title").split(","));
@@ -719,7 +734,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) {
contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
contentInfo += "(" + infoDiffRow + "). Sub-Title has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n";
infoDiffRow++;
}else{
contentLog += DummyInventoryBaseFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
@@ -1030,7 +1045,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
if(StringUtils.isNotBlank(contentLog)) {
contentInfo = contentLog;
}
contentInfo.substring(0, contentInfo.length() - 1);
contentInfo = contentInfo.substring(0, contentInfo.length() - 1);
return contentInfo;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java
+31 -31
View File
@@ -452,10 +452,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
"设计符合性确认,Pre-homo确认,验证符合性确认";
titleTwo = "交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人,交付物类型,交付物模板,发起人,责任人";
}else{
titleOne = "*serial number,subtitle,implementation category," +
"WVTA ID,certification type," +
"*certification level," +"applicable supplement,"+
"*area of responsibility,remarks," +
titleOne = "*Number,Sub-Title,Usage," +
"WVTA ID,Certification Type," +
"*Certification Level," +"Applicable Supplement,"+
"*Responsible Field,Comments," +
"design compliance check,pre-homo check,validation compliance chech";
titleTwo = "type of deliverables,deliverable template,initiator,person liable," +
"type of deliverables,deliverable template,initiator,person liable," +
@@ -468,7 +468,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){
index = list.indexOf("备注") + 1;
}else{
index = list.indexOf("remarks") + 1;
index = list.indexOf("Comments") + 1;
}
//创建临时文件夹
@@ -525,13 +525,13 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
}else{
explain = "filling explanation\n" +
"1.import data starts at the fourth line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
explain = "Filling explanation\n" +
"1.Import data starts at the fourth line\n" +
"2.All fields marked with * must be filled in\n"+
"3.Certification Type,Certification Level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
@@ -731,10 +731,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
title = "*编号,子标题,实施类别,WVTA ID,认证类型,*认证级别,适用增补件,*责任领域,备注," +
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,pre交付物类型,pre交付物模板,pre发起人,pre责任人,验证交付物类型,验证交付物模板,验证发起人,验证责任人";
}else{
title = "*serial number,subtitle,implementation category," +
"WVTA ID,certification type," +
"*certification level," +"applicable supplement,"+
"*area of responsibility,remarks," +
title = "*Number,Sub-Title,Usage," +
"WVTA ID,Certification Type," +
"*Certification Level," +"Applicable Supplement,"+
"*Responsible Field,Comments," +
"design type of deliverables,design deliverable template,design initiator,design person liable," +
"pre type of deliverables,pre deliverable template,pre initiator,pre person liable," +
"verify type of deliverables,verify deliverable template,verify initiator,verify person liable";
@@ -1026,7 +1026,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
String verifyDeliverableTemplate = dummyInventoryInfoEO.getVerifyDeliverableTemplate();
//编号(输入框必填)
flag = must(dummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "serial number");
flag = must(dummyInventoryInfoEO, errorMsg, msgList, serialNumber, "编号", "Number");
//子标题
if(StringUtils.isNotBlank(subtitle)){
@@ -1067,30 +1067,30 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
//实施类别(单选不必填)
value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, implementType,msgList,"实施类别","Usage","implement_type");
if(StringUtils.isNotBlank(value)){
dummyInventoryInfoEO.setImplementType(value);
}
//认证类型(单选不必填)
value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationType,msgList,"认证类型","Certification Type","attestation_type");
if(StringUtils.isNotBlank(value)){
dummyInventoryInfoEO.setAttestationType(value);
}
//认证级别(单选必填)
flag = must(dummyInventoryInfoEO, errorMsg, msgList, attestationRank,"认证级别","certification level");
flag = must(dummyInventoryInfoEO, errorMsg, msgList, attestationRank,"认证级别","Certification Level");
if(flag){
value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationRank,msgList,"认证级别","certification level","attestation_rank");
value = pullSingle(dictItemList, dummyInventoryInfoEO, errorMsg, attestationRank,msgList,"认证级别","Certification Level","attestation_rank");
if(StringUtils.isNotBlank(value)){
dummyInventoryInfoEO.setAttestationRank(value);
}
}
//责任领域(多选必填)
flag = must(dummyInventoryInfoEO, errorMsg, msgList, dutyTerritory,"责任领域","area of responsibility");
flag = must(dummyInventoryInfoEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
if(flag){
value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","area of responsibility","duty_territory");
value = pullMore(dictItemList, dummyInventoryInfoEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
dummyInventoryInfoEO.setDutyTerritory(value);
}
@@ -1442,23 +1442,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
case "验证责任人": return "verifyDuty";
case "*serial number": return "serialNumber";
case "*Number": return "serialNumber";
case "title": return "title";
case "subtitle": return "subtitle";
case "Sub-Title": return "subtitle";
// case "适用范围": return "shi4Yong4Fan4Wei2";
// case "状态": return "state";
// case "对应标准": return "correspondingStandard";
case "implementation category": return "implementType";
case "Usage": return "implementType";
// case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
// case "在产车实施日期": return "implementTime";
// case "WVTA ID": return "wvtaId";
case "certification type": return "attestationType";
case "*certification level": return "attestationRank";
case "responsibility": return "applicableSupplement";
case "Certification Type": return "attestationType";
case "*Certification Level": return "attestationRank";
case "Applicable Supplement": return "applicableSupplement";
// case "技术领域": return "technologyTerritory";
case "*area of responsibility": return "dutyTerritory";
case "*Responsible Field": return "dutyTerritory";
// case "适用地区": return "region";
case "remarks": return "remark";
case "Comments": return "remark";
case "design type of deliverables": return "designDeliverableType";
case "design deliverable template": return "designDeliverableTemplate";
case "design initiator": return "designInitiator";
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryLogEOController.java
+14 -12
View File
@@ -1,25 +1,26 @@
package com.jero.modules.project.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.jero.common.api.vo.Result;
import com.jero.common.system.query.QueryGenerator;
import com.jero.modules.project.entity.ProjectLawsInventoryLogEO;
import com.jero.modules.project.service.IProjectLawsInventoryLogEOService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import com.jero.common.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.ProjectLawsInventoryLogEO;
import com.jero.modules.project.service.IProjectLawsInventoryLogEOService;
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.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.jero.common.aspect.annotation.AutoLog;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
@@ -53,6 +54,7 @@ public class ProjectLawsInventoryLogEOController extends JeroController<ProjectL
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProjectLawsInventoryLogEO> queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryLogEO, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<ProjectLawsInventoryLogEO> page = new Page<ProjectLawsInventoryLogEO>(pageNo, pageSize);
IPage<ProjectLawsInventoryLogEO> pageList = projectLawsInventoryLogEOService.page(page, queryWrapper);
return Result.OK(pageList);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java
+1 -1
View File
@@ -29,7 +29,7 @@ import java.util.Map;
* @Date: 2022-04-11
* @Version: V1.0
*/
@Api(tags="项目库-项目库-相关人员维护表")
@Api(tags="项目库-相关人员维护表")
@RestController
@RequestMapping("/project/projectRelatedPersonnel")
@Slf4j
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectStatusBoardController.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ProjectStatusBoardController {
@AutoLog(value = "时间轴列")
@ApiOperation(value="时间轴列", notes="时间轴列")
@GetMapping(value = "/timeline")
public Result<?> timeline(Date startTime,Date endTime) {
public Result<?> timeline(String startTime,String endTime) {
List<String> timeline = iProjectStatusBoardService.timeline(startTime, endTime);
return Result.OK(timeline);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java
+21 -8
View File
@@ -121,6 +121,8 @@ public class ProjectLawsInventoryEO implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "新车型实施日期")
private Date xin1Che1Xing2Shi2Shi1Ri4Qi1;
@TableField(exist = false)
private String xin1Che1Xing2Shi2Shi1Ri4Qi1String;
/**在产车实施日期*/
@Excel(name = "在产车实施日期", width = 20, format = "yyyy-MM-dd")
@@ -128,6 +130,8 @@ public class ProjectLawsInventoryEO implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "在产车实施日期")
private Date implementTime;
@TableField(exist = false)
private String implementTimeString;
/**认证类型*/
@Excel(name = "认证类型", width = 20,dicCode ="attestation_type")
@@ -141,6 +145,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@Dict(dicCode ="attestation_rank")
private String attestationRank;
//适用增补件
@Excel(name = "适用增补件", width = 20)
private String applicableSupplement;
/**WVTA ID*/
@Excel(name = "WVTA ID", width = 20)
@ApiModelProperty(value = "WVTA ID")
@@ -236,6 +244,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String designDueDateString;
//交付物说明
@Excel(name = "设计符合性确认-交付物说明", width = 20)
private String designRemark;
/**prehomo确认-交付物类型*/
@Excel(name = "prehomo确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "prehomo确认-1")
@@ -288,6 +300,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String prehomoDueDateString;
//prehomo确认-交付物说明
@Excel(name = "prehomo确认-交付物说明", width = 20)
private String prehomoRemark;
/**验证符合性确认-交付物类型*/
@Excel(name = "验证符合性确认-交付物类型", width = 20,dicCode ="deliverable_template")
@ApiModelProperty(value = "验证符合性确认-交付物类型")
@@ -340,6 +356,10 @@ public class ProjectLawsInventoryEO implements Serializable {
@TableField(exist = false)
private String verifyDueDateString;
//验证备注
@Excel(name = "验证符合性确认-交付物说明", width = 20)
private String verifyRemark;
@TableField(exist = false)
@ApiModelProperty(value = "角色代码")
private String roleCode;//角色代码
@@ -395,12 +415,5 @@ public class ProjectLawsInventoryEO implements Serializable {
@ApiModelProperty(value = "调取虚拟清单,虚拟清单中维护数据为空时,进行二次确认")
private String flag;
//适用增补件
private String applicableSupplement;
//验证备注
private String verifyRemark;
//pre备注
private String prehomoRemark;
//设计备注
private String designRemark;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryLogEO.java
+3 -3
View File
@@ -58,9 +58,9 @@ public class ProjectLawsInventoryLogEO implements Serializable {
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**法规清单表id*/
@Excel(name = "法规清单表id", width = 15)
@ApiModelProperty(value = "法规清单表id")
/**项目id*/
@Excel(name = "项目id", width = 15)
@ApiModelProperty(value = "项目id")
private String projectLibraryId;
/**log内容*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+2 -2
View File
@@ -97,8 +97,8 @@ public class ProjectLibraryBase implements Serializable {
private String cut;
@TableField(exist = false)
private java.util.Date startTime;
private String startTime;
@TableField(exist = false)
private java.util.Date endTime;
private String endTime;
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java
+28 -1
View File
@@ -1,16 +1,43 @@
package com.jero.modules.project.enums;
public enum ProjectInventoryFieldEnum {
SUBTITLE("子标题","subtitle"),
WVTA_ID("WVTA ID","wvta_id"),
TECHNOLOGY_TERRITORY("技术领域","technology_territory"),
DUTY_TERRITORY("责任领域","duty_territory"),
REGULATION_OWNER_NAME("法规工程师名称","regulation_owner_name"),
HOMOLOGATION_ENGINEER_NAME("认证工程师名称","homologation_engineer_name"),
ENGINEERING_INTERFACE_PERSON_NAME("工程接口人名称","engineering_interface_personName"),
IMPLEMENT_TYPE("实施类别","implement_type"),
ATTESTATION_TYPE("认证类型","attestation_type"),
ATTESTATION_RANK("认证级别","attestation_rank"),
XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期","xin1_che1_xing2_shi2_shi1_ri4_qi1"),
IMPLEMENT_TIME("在产车实施日期","implement_time"),
REGION("适用地区","region"),
REMARK("备注","remark"),
DESIGN_DUE_DATE("设计符合性确认-截止时间","designDueDate"),
PREHOMO_DUE_DATE("Pre-Homo确认-截止时间","prehomoDueDate"),
VERIFY_DUE_DATE("验证符合性确认-截止时间","verifyDueDate"),
DELIVERABLE_TEMPLATE("交付物类型","deliverable_template"),
FA1_QI3_REN2("发起人","fa1_qi3_ren2"),
ZE2_REN2_REN2("责任人","ze2_ren4_ren2"),
DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型","deliverable_template"),
DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板","design_deliverable_template"),
DESIGN_INITIATOR("设计符合性确认-发起人","fa1_qi3_ren2"),
DESIGN_DUTY("设计符合性确认-责任人","ze2_ren4_ren2"),
PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型","deliverable_template"),
PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板","prehomo_deliverable_template"),
PREHOMO_INITIATOR("prehomo确认-发起人","fa1_qi3_ren2"),
PREHOMO_DUTY("prehomo确认-责任人","ze2_ren4_ren2"),
VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型","deliverable_template"),
VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板","verify_deliverable_template"),
VERIFY_INITIATOR("验证符合性确认-发起人","fa1_qi3_ren2"),
VERIFY_DUTY("验证符合性确认-责任人","ze2_ren4_ren2"),
;
String name;
String value;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectStatusBoardService.java
+1 -1
View File
@@ -23,7 +23,7 @@ public interface IProjectStatusBoardService {
*/
List<Map<String,Object>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req);
List<String> timeline(Date startTime, Date endTime);
List<String> timeline(String startTime, String endTime);
/**
* 项目状态进度
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+541 -78
View File
@@ -1,9 +1,6 @@
package com.jero.modules.project.service.impl;
import cn.hutool.core.util.ZipUtil;
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum;
import com.jero.modules.dummy.service.impl.DummyInventoryBaseEOServiceImpl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.utils.IOUtils;
@@ -22,9 +19,12 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils;
import com.jero.modules.document.entity.BussDocumentLibraryEO;
import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
import com.jero.modules.dummy.entity.DummyInventoryInfoEO;
import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum;
import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
import com.jero.modules.dummy.service.impl.DummyInventoryBaseEOServiceImpl;
import com.jero.modules.dummy.util.ListDiff;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.message.websocket.WebSocket;
import com.jero.modules.oss.entity.OSSFile;
@@ -48,6 +48,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import lombok.SneakyThrows;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
@@ -308,7 +309,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
boolean checkResult = checkData(projectLawsInventoryEO.getProjectLibraryId(), currentUser.getId(), projectLawsInventoryEO.getId());
if(checkResult){
projectLawsInventoryEO.setUpdateTime(now);
//更新log
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String username = sysUser.getUsername();
String contentLog = username+"编辑了清单中的\"" + projectLawsInventoryEO.getSerialNumber() + "\"标准:";
List<ProjectLawsInventoryEO> infoEOList = new ArrayList<>();
infoEOList.add(projectLawsInventoryEO);
//查询数据库里原来的数据
QueryWrapper<ProjectLawsInventoryEO> queryWrapper = new QueryWrapper<>();
List<ProjectLawsInventoryEO> dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId()));
//保存
saveOrUpdate(projectLawsInventoryEO);
//翻译
translateData(infoEOList);
translateData(dataList);
//比对不同字段
Map<String, String> infoDiff = ListDiff.compareObject(dataList.get(0),projectLawsInventoryEO);
//设置更新log
contentLog = setContentLog(infoDiff,contentLog);
projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId());
}else {
throw new JeroBootException("该用户没有权限操作该数据！");
}
@@ -1354,14 +1377,34 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//在产车实施日期implementTime
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){
projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime());
if (info.getImplementTime() == null){
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString());
}else {
if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) {
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString());
}
}
}
//新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){
projectLawsInventoryEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
}else {
if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) {
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String());
}
}
}
//适用地区region
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){
projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion());
if (StringUtils.isBlank(info.getRegion())){
info.setRegion("空");
}
if (!info.getRegion().equals(inputInfoEO.getRegion())) {
setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion());
}
}
//设计符合性确认截止时间
if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){
@@ -1411,6 +1454,63 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
private void translateData(List<ProjectLawsInventoryEO> infoList) {
for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) {
//子标题
if (StringUtils.isBlank(projectLawsInventoryEO.getSubtitle())) {
projectLawsInventoryEO.setSubtitle("空");
}
//WVTA ID
if (StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())) {
projectLawsInventoryEO.setWvtaId("空");
}
//备注
if (StringUtils.isBlank(projectLawsInventoryEO.getRemark())) {
projectLawsInventoryEO.setRemark("空");
}
//实施类别
if (StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())) {
List<SysDictItem> implementType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue());
String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setImplementType(implementTypeName);
} else {
projectLawsInventoryEO.setImplementType("空");
}
//在产车实施日期
if (projectLawsInventoryEO.getImplementTime() != null) {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
String dateString = sdf.format(projectLawsInventoryEO.getImplementTime());
projectLawsInventoryEO.setImplementTimeString(dateString);
}else {
projectLawsInventoryEO.setImplementTimeString("空");
}
//新车型实施日期
if (projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null) {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
String dateString = sdf.format(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1());
projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(dateString);
}else {
projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String("空");
}
//认证类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) {
List<SysDictItem> attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue());
String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setAttestationType(attestationTypeName);
} else {
projectLawsInventoryEO.setAttestationType("空");
}
//认证级别
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue());
String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setAttestationRank(attestationRankName);
} else {
projectLawsInventoryEO.setAttestationRank("空");
}
//责任领域
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) {
List<SysDictItem> dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue());
@@ -1424,30 +1524,157 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} else {
projectLawsInventoryEO.setDutyTerritory("空");
}
//实施类别
if (StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())) {
List<SysDictItem> implementType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue());
String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setImplementType(implementTypeName);
} else {
projectLawsInventoryEO.setImplementType("空");
//适用地区
if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegion())) {
List<SysDictItem> region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue());
List<String> regionList = Arrays.asList(projectLawsInventoryEO.getRegion().split(","));
StringBuilder regionBuilder = new StringBuilder();
for (String midRegion : regionList) {
String regionName = region.stream().filter(e -> e.getItemValue().equals(midRegion)).map(f -> f.getItemText()).collect(Collectors.joining(","));
regionBuilder.append(regionName).append(",");
}
projectLawsInventoryEO.setRegion(regionBuilder.substring(0, regionBuilder.toString().length() - 1));
}else {
projectLawsInventoryEO.setRegion("空");
}
//认证类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) {
List<SysDictItem> attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue());
String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setAttestationType(attestationTypeName);
} else {
projectLawsInventoryEO.setAttestationType("空");
//交付物类型
List<SysDictItem> deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue());
//设计符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) {
String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName);
}else {
projectLawsInventoryEO.setDesignDeliverableType("空");
}
//认证级别
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) {
List<SysDictItem> attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue());
String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setAttestationRank(attestationRankName);
} else {
projectLawsInventoryEO.setAttestationRank("空");
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) {
String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName);
}else {
projectLawsInventoryEO.setPrehomoDeliverableType("空");
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) {
String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(","));
projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName);
}else {
projectLawsInventoryEO.setVerifyDeliverableType("空");
}
List<String> userIdList= new ArrayList<>();
//法规工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) {
userIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
} else {
projectLawsInventoryEO.setRegulationOwnerName("空");
}
//认证工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) {
userIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
}else {
projectLawsInventoryEO.setHomologationEngineerName("空");
}
//工程接口人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
userIdList.add(projectLawsInventoryEO.getEngineeringInterfacePerson());
}else {
projectLawsInventoryEO.setEngineeringInterfacePersonName("空");
}
//发起人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) {
userIdList.add(projectLawsInventoryEO.getDesignInitiatorId());
}else {
projectLawsInventoryEO.setDesignInitiatorName("空");
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) {
userIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId());
}else {
projectLawsInventoryEO.setPrehomoInitiatorName("空");
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) {
userIdList.add(projectLawsInventoryEO.getVerifyInitiatorId());
}else {
projectLawsInventoryEO.setVerifyInitiatorName("空");
}
//责任人
if (StringUtils.isBlank(projectLawsInventoryEO.getDesignDutyId())) {
userIdList.add(projectLawsInventoryEO.getDesignDutyId());
}else {
projectLawsInventoryEO.setDesignDutyName("空");
}
if (StringUtils.isBlank(projectLawsInventoryEO.getPrehomoDutyId())) {
userIdList.add(projectLawsInventoryEO.getPrehomoDutyId());
}else {
projectLawsInventoryEO.setPrehomoDutyName("空");
}
if (StringUtils.isBlank(projectLawsInventoryEO.getVerifyDutyId())) {
userIdList.add(projectLawsInventoryEO.getVerifyDutyId());
}else {
projectLawsInventoryEO.setVerifyDutyName("空");
}
userIdList = userIdList.stream().distinct().collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(userIdList)){
QueryWrapper<SysUser> userqueryWrapper = new QueryWrapper<>();
List<SysUser> userList = sysUserService.list(userqueryWrapper.in("id ", userIdList));
//法规工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setRegulationOwnerName(userName);
}
//认证工程师
if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setHomologationEngineerName(userName);
}
//工程接口人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setEngineeringInterfacePersonName(userName);
}
//发起人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setDesignInitiatorName(userName);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setPrehomoInitiatorName(userName);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setVerifyInitiatorName(userName);
}
//责任人
if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setDesignDutyName(userName);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setPrehomoDutyName(userName);
}
if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) {
String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0);
projectLawsInventoryEO.setVerifyDutyName(userName);
}
}
//截止时间
//设计符合性确认-截止时间 designDueDate
if (projectLawsInventoryEO.getDesignDueDate() != null) {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
@@ -1465,7 +1692,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryEO.setPrehomoDueDateString("空");
}
//验证符合性确认-截止时间 verifyDueDate
if (projectLawsInventoryEO.getDesignDueDate() != null) {
if (projectLawsInventoryEO.getVerifyDueDate() != null) {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
String dateString = sdf.format(projectLawsInventoryEO.getVerifyDueDate());
projectLawsInventoryEO.setVerifyDueDateString(dateString);
@@ -1593,20 +1820,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String titleTwo = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
titleOne = "*编号,子标题,WVTA ID," +
"实施类别,认证类型,*认证级别," +
"实施类别,认证类型,*认证级别,适用增补件," +
"*责任领域,法规工程师,认证工程师,工程接口人," +
"备注," +
"设计符合性确认,Pre-homo确认,验证符合性确认";
titleTwo = "交付物类型,交付物模板,发起人,责任人,截止时间,交付物类型,交付物模板,发起人,责任人,截止时间,交付物类型,交付物模板,发起人,责任人,截止时间,";
titleTwo = "交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," +
"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明," +
"交付物类型,交付物模板,发起人,责任人,截止时间,交付物说明";
}else{
titleOne = "*serial number,subtitle,WVTA ID," +
"*implementation category,certification type,*certification level," +
"*area of responsibility,laws engineer,authentication engineer,engineering interface person," +
"remarks," +
titleOne = "*Number,Sub-Title,WVTA ID," +
"Usage,Certification Type,*Certification Level,Applicable Supplements," +
"*Responsible Field,laws engineer,authentication engineer,engineering interface person," +
"Comments," +
"design compliance check,pre-homo check,validation compliance chech";
titleTwo = "type of deliverables,deliverable template,initiator,person liable,deadline," +
"type of deliverables,deliverable template,initiator,person liable,deadline," +
"type of deliverables,deliverable template,initiator,person liable,deadline";
titleTwo = "type of deliverables,deliverable template,initiator,person liable,deadline,Deliverables Description," +
"type of deliverables,deliverable template,initiator,person liable,deadline,Deliverables Description," +
"type of deliverables,deliverable template,initiator,person liable,deadline,Deliverables Description";
}
List<String> list = Arrays.asList(titleOne.split(","));
@@ -1614,7 +1843,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
index = list.indexOf("备注") + 1;
}else{
index = list.indexOf("remarks") + 1;
index = list.indexOf("Comments") + 1;
}
//创建临时文件夹
@@ -1637,14 +1866,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
int count = 1;
int startLine = 0;
int endLine = 0;
int line = 4;
int line = 5;
for (int i = 0; i < index; i++) {
//合并单元格
CellRangeAddress region1 =
new CellRangeAddress(0, 1, i, i);
sheet.addMergedRegion(region1);
}
for (int i = index; i < 15; i++) {
for (int i = index; i < 16; i++) {
if(count > 1){
startLine = startLine + line + 1;
endLine = startLine + line;
@@ -1659,7 +1888,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
count ++;
}
CellRangeAddress region =
new CellRangeAddress(2, 2, 0, 25); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
new CellRangeAddress(2, 2, 0, 29); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列
sheet.addMergedRegion(region);
String explain= "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
@@ -1671,13 +1900,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
"5.编号,子标题,WVTA ID,备注,填写文本内容\n" +
"6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx";
}else{
explain = "filling explanation\n" +
"1.import data starts at the fourth line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
explain = "Filling explanation\n" +
"1.Import data starts at the fourth line\n" +
"2.All fields marked with * must be filled in\n"+
"3.Certification type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.Deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
@@ -1694,7 +1923,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
row.createCell(lineTemp).setCellValue(headerArr[m]);
Cell cell = row.getCell(lineTemp);
cell.setCellStyle(cellStyle);
lineTemp = lineTemp + 5;
lineTemp = lineTemp + 6;
}
}
@@ -1702,7 +1931,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//titleTwo
String[] headerArrTwo = titleTwo.split(",");
for (int j = 0; j < headerArrTwo.length; j++) {
row.createCell(11+j).setCellValue(headerArrTwo[j]);
row.createCell(12+j).setCellValue(headerArrTwo[j]);
}
}else{
short height = (short) (7 * 252);
@@ -1797,20 +2026,20 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String title = "";
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
title = "*编号,子标题,WVTA ID," +
"实施类别,认证类型,*认证级别," +
"实施类别,认证类型,*认证级别,适用增补件," +
"*责任领域,法规工程师,认证工程师,工程接口人," +
"备注," +
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间," +
"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间," +
"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间";
"设计交付物类型,设计交付物模板,设计发起人,设计责任人,设计截止时间,设计交付物说明," +
"pre交付物类型,pre交付物模板,pre发起人,pre责任人,pre截止时间,pre交付物说明," +
"验证交付物类型,验证交付物模板,验证发起人,验证责任人,验证截止时间,验证交付物说明";
}else{
title = "*serial number,subtitle,WVTA ID," +
"*implementation category,certification type,*certification level," +
"*area of responsibility,laws engineer,authentication engineer,engineering interface person," +
"remarks," +
"design type of deliverables,design deliverable template,design initiator,design person liable,design deadline," +
"pre type of deliverables,pre deliverable template,pre initiator,pre person liable,pre deadline," +
"verify type of deliverables,verify deliverable template,verify initiator,verify person liable,verify deadline";
title = "*Number,Sub-Title,WVTA ID," +
"Usage,Certification Type,*Certification Level,Applicable Supplements," +
"*Responsible Field,laws engineer,authentication engineer,engineering interface person," +
"Comments," +
"design type of deliverables,design deliverable template,design initiator,design person liable,design deadline,design Deliverables Description," +
"pre type of deliverables,pre deliverable template,pre initiator,pre person liable,pre deadline,pre Deliverables Description," +
"verify type of deliverables,verify deliverable template,verify initiator,verify person liable,verify deadline,verify Deliverables Description";
}
int pos = file.getOriginalFilename().lastIndexOf(".");
@@ -1926,13 +2155,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (i == 0) {
cell.setCellType(HSSFCell.CELL_TYPE_STRING);
headerSb.append(cell.getStringCellValue() + ",");
if(j == 10){
if(j == 11){
break;
}
}else if(i == 1){
if(j > 10){
if(j > 11){
String flag = "";
if(10 < j && j < 16){
if(11 < j && j < 18){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="设计";
}else{
@@ -1940,7 +2169,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
key = flag + headerCell.getStringCellValue();
}
if(15 < j && j < 21){
if(17 < j && j < 24){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="pre";
}else{
@@ -1948,7 +2177,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
key = flag + headerCell.getStringCellValue();
}
if(20 < j && j < 26){
if(23 < j && j < 30){
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
flag ="验证";
}else{
@@ -2150,7 +2379,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String verifyDeliverableTemplate = projectLawsInventoryEO.getVerifyDeliverableTemplate();
//编号(输入框必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "serial number");
flag = must(projectLawsInventoryEO, errorMsg, msgList, serialNumber, "编号", "Number");
//子标题
if(StringUtils.isNotBlank(subtitle)){
@@ -2190,29 +2419,29 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
}
//实施类别(单选不必填)
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","implementation category","implement_type");
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, implementType,msgList,"实施类别","Usage","implement_type");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setImplementType(value);
}
//认证类型(单选不必填)
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","certification type","attestation_type");
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationType,msgList,"认证类型","Certification Type","attestation_type");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setAttestationType(value);
}
//认证级别(单选必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank,"认证级别","certification level");
flag = must(projectLawsInventoryEO, errorMsg, msgList, attestationRank,"认证级别","Certification Level");
if(flag){
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank,msgList,"认证级别","certification level","attestation_rank");
value = pullSingle(dictItemList, projectLawsInventoryEO, errorMsg, attestationRank,msgList,"认证级别","Certification Level","attestation_rank");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setAttestationRank(value);
}
}
//责任领域(多选必填)
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","area of responsibility");
flag = must(projectLawsInventoryEO, errorMsg, msgList, dutyTerritory,"责任领域","Responsible Field");
if(flag){
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","area of responsibility","duty_territory");
value = pullMore(dictItemList, projectLawsInventoryEO, errorMsg, dutyTerritory,msgList,"责任领域","Responsible Field","duty_territory");
if(StringUtils.isNotBlank(value)){
projectLawsInventoryEO.setDutyTerritory(value);
}
@@ -2488,7 +2717,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
}else{
errorMsg += nameEn+regulationOwnerId+"does not match a person under the area of responsibility in the relevant person list";
errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
}
msgList.add(errorMsg);
}
@@ -2496,7 +2725,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){
errorMsg += nameCn+regulationOwnerId+"与相关人员名单中责任领域下的人员不匹配";
}else{
errorMsg += nameEn+regulationOwnerId+"does not match a person under the area of responsibility in the relevant person list";
errorMsg += nameEn+regulationOwnerId+"does not match a person under the Responsible Field in the relevant person list";
}
msgList.add(errorMsg);
}
@@ -2635,25 +2864,27 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if (field == null) return null;
switch (field) {
case "*编号": return "serialNumber";
case "*serial number": return "serialNumber";
case "*Number": return "serialNumber";
case "标题": return "title";
case "子标题": return "subtitle";
case "subtitle": return "subtitle";
case "Sub-Title": return "subtitle";
case "适用范围": return "shi4Yong4Fan4Wei2";
case "状态": return "state";
case "对应标准": return "correspondingStandard";
case "实施类别": return "implementType";
case "*implementation category": return "implementType";
case "Usage": return "implementType";
case "新车实施日期": return "xin1Che1Xing2Shi2Shi1Ri4Qi1";
case "在产车实施日期": return "implementTime";
case "WVTA ID": return "wvtaId";
case "认证类型": return "attestationType";
case "certification type": return "attestationType";
case "Certification Type": return "attestationType";
case "*认证级别": return "attestationRank";
case "*certification level": return "attestationRank";
case "*Certification Level": return "attestationRank";
case "适用增补件": return "applicableSupplement";
case "Applicable Supplements": return "applicableSupplement";
case "技术领域": return "technologyTerritory";
case "*责任领域": return "dutyTerritory";
case "*area of responsibility": return "dutyTerritory";
case "*Responsible Field": return "dutyTerritory";
case "适用地区": return "region";
case "备注": return "remark";
case "remark": return "remark";
@@ -2673,6 +2904,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
case "design person liable": return "designDutyId";
case "设计截止时间": return "designDueDate";
case "design deadline": return "designDueDate";
case "设计交付物说明": return "designRemark";
case "design Deliverables Description": return "designRemark";
case "pre交付物类型": return "prehomoDeliverableType";
case "pre type of deliverables": return "prehomoDeliverableType";
case "pre交付物模板": return "prehomoDeliverableTemplate";
@@ -2683,6 +2918,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
case "pre person liable": return "prehomoDutyId";
case "pre截止时间": return "prehomoDueDate";
case "pre deadline": return "prehomoDueDate";
case "pre交付物说明": return "prehomoRemark";
case "pre Deliverables Description": return "prehomoRemark";
case "验证交付物类型": return "verifyDeliverableType";
case "verify type of deliverables": return "verifyDeliverableType";
case "验证交付物模板": return "verifyDeliverableTemplate";
@@ -2693,6 +2932,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
case "verify person liable": return "verifyDutyId";
case "验证截止时间": return "verifyDueDate";
case "verify deadline": return "verifyDueDate";
case "验证交付物说明": return "verifyRemark";
case "verify Deliverables Description": return "verifyRemark";
default: return null;
//"type of deliverables,deliverable template,initiator,person liable,deadline," +
}
@@ -3003,4 +3246,224 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
throw new JeroBootException(errorMessage);
}
}
//拼接维护清单的消息
public String setContentLog(Map<String, String> infoDiff,String contentLog) {
//设置维护清单的修改消息
if(MapUtils.isNotEmpty(infoDiff)) {
if (infoDiff.size() > 1) {
//子标题
if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) {
List<String> list = Arrays.asList(infoDiff.get("subtitle").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//WVTA ID
if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) {
List<String> list = Arrays.asList(infoDiff.get("wvtaId").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.WVTA_ID.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//实施类别
if (StringUtils.isNotBlank(infoDiff.get("implementType"))) {
List<String> list = Arrays.asList(infoDiff.get("implementType").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//在产车实施日期
if (StringUtils.isNotBlank(infoDiff.get("implementTimeString"))) {
List<String> list = Arrays.asList(infoDiff.get("implementTimeString").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//新车型实施日期
if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String"))) {
List<String> list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//认证类型
if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationType").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//认证级别
if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationRank").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//责任领域
if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) {
List<String> list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//regulationOwnerName;//法规工程师名称
if (StringUtils.isNotBlank(infoDiff.get("regulationOwnerName"))) {
List<String> list = Arrays.asList(infoDiff.get("regulationOwnerName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//homologationEngineerName;//认证工程师名称
if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) {
List<String> list = Arrays.asList(infoDiff.get("homologationEngineerName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//engineeringInterfacePersonName;//工程接口人名称
if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) {
List<String> list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//适用地区region 多选
if (StringUtils.isNotBlank(infoDiff.get("region"))) {
List<String> list = Arrays.asList(infoDiff.get("region").split("\\|"));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.REGION.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//备注
if (StringUtils.isNotBlank(infoDiff.get("remark"))) {
List<String> list = Arrays.asList(infoDiff.get("remark").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.REMARK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//设计符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableType").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//设计符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//设计符合性确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) {
List<String> list = Arrays.asList(infoDiff.get("designInitiatorName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//设计符合性确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) {
List<String> list = Arrays.asList(infoDiff.get("designDutyName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//设计符合性确认-截止时间designDueDateString;
if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) {
List<String> list = Arrays.asList(infoDiff.get("designDueDateString").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//prehomo确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//prehomo确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//prehomo确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//prehomo确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDutyName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//prehomo确认-截止时间prehomoDueDateString;
if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) {
List<String> list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//验证符合性确认-交付物类型
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//验证符合性确认-交付物模板
if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//验证符合性确认-发起人
if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//验证符合性确认-责任人
if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDutyName").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
//验证符合性确认-截止时间verifyDueDateString
if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) {
List<String> list = Arrays.asList(infoDiff.get("verifyDueDateString").split(","));
String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1);
contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ",";
}
}
}
contentLog = contentLog.substring(0, contentLog.length()-1);
return contentLog;
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java
+9 -9
View File
@@ -507,9 +507,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
explainInfo = "filling explanation\n" +
"1.import data starts at the third line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"3.Certification Type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
HSSFRichTextString explain=new HSSFRichTextString(explainInfo);
@@ -617,9 +617,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
explainInfo = "filling explanation\n" +
"1.import data starts at the third line\n" +
"2.all fields marked with * must be filled in\n" +
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"3.Certification Type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
HSSFRichTextString explain = new HSSFRichTextString(explainInfo);
@@ -683,9 +683,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl<ProjectRelat
explainInfo = "filling explanation\n" +
"1.import data starts at the third line\n" +
"2.all fields marked with * must be filled in\n"+
"3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" +
"3.Certification Type,Certification Level,Usage,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" +
"4.Responsible Field, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" +
"5.Number,Sub-Title,WVTA ID,Comments,Fill in the text\n" +
"6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx";
}
List<String> titleOneList = Arrays.asList(titleOne.split(","));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+13 -10
View File
@@ -18,6 +18,7 @@ import com.jero.modules.project.service.IProjectStatusBoardService;
import com.jero.modules.project.vo.TimeNodeVO;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
import lombok.SneakyThrows;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -61,11 +62,12 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
* @param req
* @return
*/
@SneakyThrows
@Override
public List<Map<String,Object>> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) {
// QueryWrapper<ProjectLibraryBase> queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
//项目库信息
List<ProjectLibraryBase> projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase);
List<List<TimeNodeVO>> list = new ArrayList<>();
@@ -79,15 +81,15 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
int index = 0;
list = projectTaskPlanningService.queryByProjectId(StringUtils.join(projectLibraryBaseIdList, ","), projectLibraryBase.getCut());
//时间段筛选,过滤数据
Date startTime = projectLibraryBase.getStartTime();
Date endTime = projectLibraryBase.getEndTime();
String startTime = projectLibraryBase.getStartTime();
String endTime = projectLibraryBase.getEndTime();
List<List<TimeNodeVO>> listNew = new ArrayList<>();
if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
for (List<TimeNodeVO> timeNodeVOS : list) {
List<TimeNodeVO> timeNodeVOList = new ArrayList<>();
for (TimeNodeVO timeNodeVO : timeNodeVOS) {
Date time = timeNodeVO.getTime();
if(time.after(startTime) && time.before(endTime)){
if(time.after(sdf.parse(startTime)) && time.before(sdf.parse(endTime))){
TimeNodeVO timeNodeVOTemp = new TimeNodeVO();
BeanUtils.copyProperties(timeNodeVO,timeNodeVOTemp);
timeNodeVOTemp.setTime(time);
@@ -400,27 +402,28 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
}
@SneakyThrows
@Override
public List<String> timeline(Date startTime, Date endTime) {
public List<String> timeline(String startTime, String endTime) {
List<String> result = new ArrayList<String>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
Calendar calendarBefore = Calendar.getInstance();
if(ObjectUtils.isNotEmpty(startTime)){
calendarBefore.setTime(startTime);
calendarBefore.setTime(sdf.parse(startTime));
}else{
calendarBefore.setTime(new Date());
calendarBefore.add(Calendar.MONTH, -6);
}
calendarBefore.add(Calendar.MONTH, -6);
Date dateBefore = calendarBefore.getTime();
Calendar calendarAfter = Calendar.getInstance();
if(ObjectUtils.isNotEmpty(endTime)){
calendarAfter.setTime(endTime);
calendarAfter.setTime(sdf.parse(endTime));
}else{
calendarAfter.setTime(new Date());
calendarAfter.add(Calendar.MONTH, +5);
}
calendarAfter.add(Calendar.MONTH, +5);
Date dateAfter = calendarAfter.getTime();
Calendar min = Calendar.getInstance();
jero-web/package-lock.json
Generated
+15
View File
@@ -34,6 +34,7 @@
"vue": "^2.6.10",
"vue-area-linkage": "^5.1.0",
"vue-cropper": "^0.5.4",
"vue-draggable-resizable": "^2.1.0",
"vue-i18n": "^8.26.8",
"vue-loader": "^15.7.0",
"vue-ls": "^3.2.0",
@@ -19415,6 +19416,15 @@
"resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.6.tgz",
"integrity": "sha512-54Z/AipXDBcE5nzJweTM+BryzSAcC0FCTMQLvLt6f4XanP4AWB3mPkQw3PG3NRICo7knljHO+N+pjZxYAKoTLQ=="
},
"node_modules/vue-draggable-resizable": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/vue-draggable-resizable/-/vue-draggable-resizable-2.1.0.tgz",
"integrity": "sha512-DQe5JjiqPjndc3XZkkZAMVygMlJ4TLcpMWM78IkizHeJBfX5Ki6OKZPxrT+HE7w/12d+OfWom5Y5phYcrwCzqg==",
"engines": {
"node": ">= 4.0.0",
"npm": ">= 3.0.0"
}
},
"node_modules/vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
@@ -37285,6 +37295,11 @@
"resolved": "https://registry.npmjs.org/vue-cropper/-/vue-cropper-0.5.6.tgz",
"integrity": "sha512-54Z/AipXDBcE5nzJweTM+BryzSAcC0FCTMQLvLt6f4XanP4AWB3mPkQw3PG3NRICo7knljHO+N+pjZxYAKoTLQ=="
},
"vue-draggable-resizable": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/vue-draggable-resizable/-/vue-draggable-resizable-2.1.0.tgz",
"integrity": "sha512-DQe5JjiqPjndc3XZkkZAMVygMlJ4TLcpMWM78IkizHeJBfX5Ki6OKZPxrT+HE7w/12d+OfWom5Y5phYcrwCzqg=="
},
"vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
jero-web/package.json
+1
View File
@@ -36,6 +36,7 @@
"vue": "^2.6.10",
"vue-area-linkage": "^5.1.0",
"vue-cropper": "^0.5.4",
"vue-draggable-resizable": "^2.1.0",
"vue-i18n": "^8.26.8",
"vue-loader": "^15.7.0",
"vue-ls": "^3.2.0",
jero-web/src/common/lang/en-us.js
+5
View File
@@ -707,6 +707,7 @@ module.exports = {
uploadTime: 'Upload time',
enclosure: 'enclosure',
// 认证
configurationInformation: 'configuration Information',
modifyprojectInterfacePerson: 'modify project Interface Person',
operatethisbutton: 'You do not have permission to operate this button',
ParameterLibrary: 'Parameter Library',
@@ -836,4 +837,8 @@ module.exports = {
newlyAdded: 'Newly Added',
applicableSupplement: 'Applicable Supplement',
taskDescription:'Task description',
descriptionDeliverables:'Description of deliverables',
startMonth:'Start Month',
endMonth:'End Month',
Importing:'Importing',
}
jero-web/src/common/lang/zh-cn.js
+6 -1
View File
@@ -717,6 +717,7 @@ module.exports = {
uploadTime: '上传时间',
enclosure: '附件',
// 认证
configurationInformation: '配置信息',
modifyprojectInterfacePerson: '修改工程接口人',
operatethisbutton: '没有权限操作此按钮',
ParameterLibrary: '参数库',
@@ -840,5 +841,9 @@ module.exports = {
verificationComplianceConfirmationProgress: '验证符合性确认进度',
totalTable: '总数',
applicableSupplement: '适用增补件',
taskDescription: '任务说明'
taskDescription: '任务说明',
descriptionDeliverables:'交付物说明',
startMonth:'开始日期',
endMonth:'结束日期',
Importing:'导入中',
}
jero-web/src/components/ImportFile/index.vue
+41
View File
@@ -9,6 +9,14 @@
<a-icon type="import" :rotate="270"/>
{{$t('import')}}
</a-upload>
<div class="loading-box" v-if="spinning">
<div class="loading-content">
<a-icon class="loading" type="loading" />
<div class="loading-tips">
{{this.$t('Importing')}}...
</div>
</div>
</div>
</div>
</template>
@@ -53,6 +61,7 @@
data() {
return {
tokenHeader: { 'X-Access-Token': Vue.ls.get(ACCESS_TOKEN) },
spinning: false,
cut: ''
}
},
@@ -174,4 +183,36 @@
font-weight: 400 !important;
color: #040B29 !important;
}
</style>
<style scoped lang="less">
.loading-box{
position: fixed;
top: 0;
left: 0;
z-index: 9999900;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.9);
border-radius: 8px;
user-select: none;
.loading-content{
position: absolute;
top: 50%;
left: 50%;
color: #21c9cc;
transform: translate(-50%, -50%);
text-align: center;
.loading{
font-size:28px ;
}
.spin-loading{
animation: rotating 2s linear infinite;
}
.loading-tips{
margin-top: 5px;
font-size: 16px;
color: #21c9cc;
}
}
}
</style>
jero-web/src/components/tableCollection/index.vue
+186 -40
View File
@@ -10,9 +10,13 @@
:data-source="dataSource"
:loading="loading"
:columns="columns"
:components="components"
@change="tableOnChange"
@onHeaderRow='onHeaderRow'
>
<span slot="titleName" slot-scope="text">
<span style='padding-right: 20px'>{{ text.sortOrder }} </span><a-button @click='onClickSee(text)'>查看</a-button>
</span>
<span slot="operationbtn" slot-scope="record">
<!-- 待发起收集 1-->
<!-- 待工程接口人处理 2-->
@@ -54,20 +58,6 @@
</span>
</span>
</span>
<span slot="operation" slot-scope="record">
<a v-for="(ol,index) in OperationList"
@click="OperationClick(ol,record)">
<span v-if="ol.text == $t('CancelCollection')" v-has="ol.has" class="text">
{{!record.collectFlag || record.collectFlag == 0 ? $t('Collection') :$t('CancelCollection')}}
</span>
<span v-else-if="ol.text == $t('CancelSubscribe')" v-has="ol.has" class="text">
{{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}}
</span>
<span v-else v-has="ol.has" class="text">
{{ol.text}}
</span>
</a>
</span>
<span slot="detailClick" slot-scope="text,record">
<collection-type :detailDate='text' />
</span>
@@ -105,6 +95,40 @@
</div>
</div>
</a-modal>
<!-- 配置信息--->
<a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('configurationName')">{{$t('configurationName')}}:</span>
<span class="text-field-right"
>{{configDetail.configName}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('Model')">{{$t('Model')}}:</span>
<span class="text-field-right"
>{{configDetail.carType}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('electricMachinery')">{{$t('electricMachinery')}}:</span>
<span class="text-field-right"
>{{configDetail.motor}}</span>
</div>
</div>
<div class="content-text">
<div class="text-field">
<span class="text-field-left" :title="$t('Version')">{{$t('Version')}}:</span>
<span class="text-field-right"
>{{configDetail.version}}</span>
</div>
<div class="text-field">
<span class="text-field-left" :title="$t('Battery')">{{$t('Battery')}}:</span>
<span class="text-field-right"
>{{configDetail.battery}}</span>
</div>
</div>
</a-modal>
</div>
</template>
@@ -115,6 +139,7 @@ import CollectionType from '@/components/CollectionType'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import axios from 'axios'
import Vue from 'vue'
import VueDraggableResizable from 'vue-draggable-resizable'
export default {
name: 'index',
props: {
@@ -135,9 +160,48 @@ export default {
}
},
components: {
CollectionType
CollectionType,
VueDraggableResizable
},
data() {
this.components = {
header: {
cell: (h, props, children) => {
const { key, ...restProps } = props
// 此处的this.columns 是定义的table的表头属性变量
const col = this.columns.find((col) => {
const k = col.dataIndex || col.key
return k === key
})
if (!col || !col.width) {
return h('th', { ...restProps }, [...children])
}
const dragProps = {
key: col.dataIndex || col.key,
class: 'table-draggable-handle',
attrs: {
w: 10,
x: col.width,
z: 1,
axis: 'x',
draggable: true,
resizable: false,
},
on: {
dragging: (x, y) => {
col.width = Math.max(x, 1)
},
},
}
const drag = h('vue-draggable-resizable', { ...dragProps })
return h('th', { ...restProps, class: 'resize-table-th' }, [...children, drag])
},
},
}
return {
token:Vue.ls.get(ACCESS_TOKEN),
jsonBody: [],
@@ -177,11 +241,44 @@ export default {
querySdtList: [], // 工程接口人
Dateline: {},
getquerySdtId: '', // 当前工程接口人的id
areaVisibleView: false, // 查看配置得弹框
configDetail: {}, // 查看配置得详细信息
}
},
mounted() {
},
methods: {
// 查看配置详细信息
onClickSee(val) {
let _this = this
this.areaVisibleView = true
axios({
url: `/jero-boot/params/config/getById?id=${val.sortColumn.dataIndex}`,
method: 'get',
transformRequest: [function (data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
}
})
.then( (res) =>{
console.log(res)
if (res.data.success) {
this.configDetail = res.data.result
}else{
_this.$message.warning(res.data.result)
}
})
.catch( (error) =>{
console.log(error);
});
},
// 获取工程接口人
getquerySdtList(record) {
// 当前工程接口人的id
@@ -274,34 +371,36 @@ export default {
var jsonHead = res.result
this.columns = []
jsonHead.forEach((res, index) => {
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
align: 'center',
ellipsis: true,
sorter: res.sort
})
if (res.type) {
this.columns[index].scopedSlots = {
customRender: 'detailClick'
// 配置列
if(res.type) {
this.columns.push({
dataIndex: res.db_field_name,
align: 'center',
ellipsis: true,
sorter: res.sort,
sortOrder: res.db_field_txt
})
this.columns[index].scopedSlots = {
customRender: 'detailClick',
title: 'titleName'
}
// 非配置列
} else {
this.columns.push({
title: res.db_field_txt,
dataIndex: res.db_field_name,
align: 'center',
ellipsis: true,
sorter: res.sort
})
if(res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
}
if(res.click) {
// 工程接口人列表修改
this.columns[index].scopedSlots = {
customRender: 'operationbtn'
}
}
})
if (this.showAction) {
this.columns.push({
title: this.$t('operation'),
align: 'center',
fixed: 'right',
width: width,
scopedSlots: { customRender: 'operation' }
})
}
}
})
},
@@ -382,6 +481,37 @@ export default {
.ant-table td {
white-space: nowrap;
}
.content-text {
width: 100%;
display: flex;
flex-wrap: wrap;
.text-field {
width: 50%;
margin-bottom: 8px;
display: flex;
.text-field-left {
width: 100px;
display: inline-block;
font-size: 14px;
font-weight: 400;
color: #6F7385;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
margin-right: 24px;
}
.text-field-right {
display: inline-block;
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
color: #040B29;
font-weight: 400;
}
}
}
</style>
<style scoped>
.box {
@@ -398,4 +528,20 @@ export default {
text-align: right;
margin-top: 20px;
}
.table-draggable-handle {
/* width: 10px !important; */
height: 100% !important;
left: auto !important;
right: -5px;
cursor: col-resize;
touch-action: none;
border: none;
position: absolute;
transform: none !important;
bottom: 0;
}
.resize-table-th {
position: relative;
}
</style>
jero-web/src/main.js
+3 -1
View File
@@ -56,7 +56,9 @@ import '@/assets/less/JAreaLinkage.less'
import VueAreaLinkage from 'vue-area-linkage'
import '@/components/jero/JVxeTable/install'
import '@/components/JVxeCells/install'
// 挂载全局使用的方法
import VueDraggableResizable from 'vue-draggable-resizable'
Vue.component('vue-draggable-resizable', VueDraggableResizable)
Vue.config.productionTip = false
Vue.use(Storage, config.storageOptions)
Vue.use(Antd)
jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+8 -1
View File
@@ -83,8 +83,15 @@
let query = {
actiProcInstId: this.$route.query.actiProcInstId
}
this.loading = true
getAction('/wkflow/processHistoryEO/list', query).then((res) => {
this.dataSource = res
if (res.success) {
this.dataSource = res.result || []
this.loading = false
} else {
this.dataSource = []
this.loading = false
}
})
}
}
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+21 -9
View File
@@ -72,17 +72,24 @@
@showSizeChange="SizeChange"
/>
</div>
<!-- 参数模板-->
<a-modal v-model="areaVisible" :title="$t('parameterTemplate')" width='750px' :footer="null">
<parameter-template v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :projectId='this.$route.query.id'></parameter-template>
<parameter-template-add v-if='areaVisible' @areaVisible='handleCancel' :templateTitle='templatetitle'
:selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :projectId='this.$route.query.id'></parameter-template-add>
</a-modal>
<!-- 配置-->
<configure ref="configureRef" :url='url' :itemId='itemId'/>
<!-- 历史版本-->
<a-modal v-model="historicalVisible" :title="$t('historicalVersion')" width='750px' :footer="null">
<historical-version v-if='historicalVisible' :historicalRow='historicalRow'></historical-version>
</a-modal>
</a-card>
</template>
<script>
import ImportFile from '@/components/ImportFile/index'
import ParameterTemplate from '../dialog/ParameterTemplate'
import ParameterTemplateAdd from '../dialog/ParameterTemplateAdd'
import HistoricalVersion from '../dialog/historicalVersion'
import { getAction,postAction } from '../../../api/manage'
import Configure from '../dialog/configure'
import axios from 'axios'
@@ -91,8 +98,9 @@
name: 'TaskParameterCollection',
components:{
ImportFile,
ParameterTemplate,
Configure
ParameterTemplateAdd,
Configure,
HistoricalVersion
},
data(){
return{
@@ -165,7 +173,9 @@
templatetitleId: '',
rowId: '',
version: 0,
itemId: ''
itemId: '',
historicalVisible: false,
historicalRow: {}, // 历史版本得数据
}
},
mounted() {
@@ -199,9 +209,11 @@
handleTableChange() {
},
//
historicalVersion() {
// 历史版本
historicalVersion(historicalRow) {
console.log(historicalRow)
this.historicalVisible = true
this.historicalRow = historicalRow
},
// 配置
configure(item) {
jero-web/src/views/projectManagement/components/listEditModel.vue
+25 -25
View File
@@ -433,21 +433,21 @@
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<a-col :span="24">
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('remarks')">{{$t('remarks')}}</span>
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'designRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designRemark ? true : false"
v-model="formInline.designRemark" :rows="4"/>
</a-form-model-item>
</div>
<a-form-model-item class="itemModel-text" :prop="'designRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('remarks')"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designRemark ? true : false"
v-model="formInline.designRemark" :rows="4"/>
</a-form-model-item>
</div>
</a-col>
</a-col>
</a-row>
<div class="header-text">
&nbsp;{{$t('PrehomoConfirmation')}}
@@ -576,12 +576,12 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('remarks')">{{$t('remarks')}}</span>
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'prehomoRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('remarks')"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoRemark ? true : false"
v-model="formInline.prehomoRemark" :rows="4"/>
</a-form-model-item>
@@ -713,12 +713,12 @@
<div class="box-title-text">
<div class="title-text">
<span class="title-text-text"
:title="$t('remarks')">{{$t('remarks')}}</span>
:title="$t('descriptionDeliverables')">{{$t('descriptionDeliverables')}}</span>
</div>
<a-form-model-item class="itemModel-text" :prop="'verifyRemark'">
<a-textarea
style="width: 100%"
:placeholder="$t('PleaseEnter')+$t('remarks')"
:placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
:disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyRemark ? true : false"
v-model="formInline.verifyRemark" :rows="4"/>
</a-form-model-item>
@@ -784,27 +784,27 @@
trigger: 'blur'
}
],
designRemark:[
designRemark: [
{
max: 300,
message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
verifyRemark:[
verifyRemark: [
{
max: 300,
message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
prehomoRemark:[
prehomoRemark: [
{
max: 300,
message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
message: this.$t('descriptionDeliverables') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
trigger: 'blur'
}
],
]
},
formInline: {},
regulatoryEngineerList: [],
@@ -1312,7 +1312,7 @@
position: absolute;
bottom: 0;
width: 100%;
z-index:100;
z-index: 100;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue → jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue
View File
jero-web/src/views/projectManagement/dialog/historicalVersion.vue
+154
View File
@@ -0,0 +1,154 @@
<template>
<div class='diolag-area'>
<a-table
class='table-area'
ref='table'
size='middle'
rowKey='id'
:columns='columns'
:dataSource='areaTable'
:pagination='false'
:loading='loading'
:scroll='{x: 600}'>
<a slot='name' slot-scope='text'>{{ text }}</a>
<span slot='action' slot-scope='text, record'>
<a class='action-edit' @click='editArea(record.id)' v-has="'area:edit'">{{ $t('edit') }}</a>
</span>
</a-table>
</div>
</template>
<script>
import { putAction, postAction, getAction, deleteAction } from '@/api/manage'
import axios from 'axios'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import Vue from 'vue'
export default {
name: 'diolagArea',
components: {},
data() {
return {
token:Vue.ls.get(ACCESS_TOKEN),
title: this.$t('add'),
total: 0,
selectedRowKeysDate: {},
loading: false,
editId: '',
columns: [
{
title: this.$t('VersionNumber'),
dataIndex: 'region_dictText',
key: 'showArea',
align: 'center',
ellipsis: true
},
{
title: this.$t('operation'),
align: 'center',
dataIndex: 'paramsTemplateName',
ellipsis: true
}
],
newVisible: false,
areaTable: [],
flag: false, //表单提交标识
spinLoading: false,
confirmLoading: false,
templatetitle: '',
selectedRowKeys: []
}
},
props: {
historicalRow: {
type: Object,
default: {},
require: true
}
},
mounted() {
this.loadData()
},
methods: {
loadData() {
let _this = this
axios({
url: `/jero-boot/params/collectManifestHistory/getConfigById?id=${this.historicalRow.id}`,
method: 'get',
transformRequest: [function (data) {
let ret = ''
for (let it in data) {
ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
}
return ret
}],
headers: {
'Content-Type': 'application/x-www-form-urlencoded',
'X-Access-Token':_this.token
}
})
.then( (res) =>{
console.log(res)
if (res.data.success) {
console.log(res,'lll')
}else{
_this.$message.warning(res.data.result)
}
})
.catch( (error) =>{
console.log(error);
});
},
//编辑按钮
editArea(val) {
this.title = this.$t('edit')
this.newVisible = true
let params = {
id: val
}
getAction(`tag/onlCgformArea/queryById`, params).then((res) => {
if (res.success) {
this.form = { ...res.result }
// this.$emit('updateOk',res.result)
}
})
}
},
}
</script>
<style lang='less' scoped>
@import '~@assets/less/common.less';
.diolag-area {
.table-area {
margin: 20px 0;
.action-edit {
margin-right: 10px;
}
}
.table-del {
color: red;
}
}
.drawer-bootom-button{
display: flex;
justify-content: center;
}
</style>
<style lang='less'>
.area-module {
.ant-modal-wrap {
.ant-modal {
.ant-modal-content {
.ant-modal-footer {
text-align: center;
}
}
}
}
}
</style>
jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+92 -23
View File
@@ -32,6 +32,24 @@
</div>
<div class="box-top">
<span class="box-top-text">{{$t('regulatoryCertificationTaskPlan')}}</span>
<span style="float: right" class="box-top-text-right">
<a-range-picker
:placeholder="[this.$t('startMonth'), this.$t('endMonth')]"
format="YYYY-MM"
v-model="getTime"
:mode="mode2"
:open="open"
@openChange="openChange"
@panelChange="panelChange"
@change="hodeChange"
>
<div slot="renderExtraFooter" style="width: 100%;display: block">
<div style="text-align: right;width: 100%">
<a @click="okChange">{{$t('determine')}}</a>
</div>
</div>
</a-range-picker>
</span>
<div class="box-top-content">
<div id="main"></div>
<div class="axis-tip"></div>
@@ -86,6 +104,7 @@
<script>
import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import * as echarts from 'echarts'
import moment from 'moment'
export default {
name: 'index',
@@ -94,6 +113,9 @@
queryParam: {},
loading: false,
dataSource: [],
open: false,
getTime: [],
mode2: ['month', 'month'],
url: {
list: '/project/ProjectStatusBoardController/scheduleInfoList',
timeline: '/project/ProjectStatusBoardController/timeline',
@@ -155,7 +177,9 @@
width: 440,
scopedSlots: { title: 'verificationComplianceReviewTitle' }
}
]
],
startTime: undefined,
endTime: undefined
}
},
mounted() {
@@ -164,14 +188,40 @@
},
methods: {
getTimeline() {
getAction(this.url.timeline, {}).then((res) => {
let query = {
startTime: this.startTime,
endTime: this.endTime
}
getAction(this.url.timeline, query).then((res) => {
if (res.success) {
this.getTimelineList(res.result)
}
})
},
openChange(val) {
this.open = val
},
okChange() {
this.open = false
this.getTimeline()
},
hodeChange() {
this.getTime = []
this.startTime = undefined
this.endTime = undefined
this.getTimeline()
},
panelChange(value, mode) {
this.getTime = value
this.startTime = moment(value[0]).format('YYYY-MM')
this.endTime = moment(value[1]).format('YYYY-MM')
},
getTimelineList(time) {
getAction(this.url.timelineList, {}).then((res) => {
let query = {
startTime: this.startTime,
endTime: this.endTime
}
getAction(this.url.timelineList, query).then((res) => {
if (res.success) {
this.getEcharts(time, res.result)
}
@@ -196,26 +246,35 @@
list.push(timeList[i] + '-' + num)
}
}
console.log(listTime)
const hours = listTime
const days = []
let content = []
if (timeData && timeData.length > 0) {
timeData.forEach(res => {
days.push(res.projectName)
content.push(res.data[0])
})
}
const data = [
[0, 0, 14], [0, 1, 5], [0, 2, 5], [0, 3, 5], [0, 4, 5], [0, 5, 5],
[1, 0, 5], [1, 2, 5], [1, 3, 5], [1, 4, 5], [1, 5, 5], [1, 6, 5],
[2, 0, 14], [2, 1, 14], [2, 2, 14], [2, 3, 14], [2, 4, 14], [2, 5, 14],
[3, 0, 14], [3, 1, 14], [3, 2, 14], [3, 3, 14], [3, 4, 14], [3, 5, 14],
[4, 0, 14], [4, 1, 14], [4, 2, 14], [4, 3, 14], [4, 4, 14], [4, 5, 14],
[5, 0, 14], [5, 1, 14], [5, 2, 14], [5, 3, 14], [5, 4, 14], [5, 5, 14],
[6, 0, 14], [6, 1, 14], [6, 2, 14], [6, 3, 14], [6, 4, 14], [6, 5, 14]
].map(function(item) {
return [item[1], item[0], item[2]]
})
let timeDataList = []
let data = []
for (let j = 0; j < content.length; j++) {
for (let k = 0; k < content[j].length; k++) {
content[j][k].index = j
timeDataList.push(content[j][k])
}
}
for (let i = 0; i < list.length; i++) {
for (let j = 0; j < timeDataList.length; j++) {
let time = JSON.stringify(timeDataList[j].time).slice(1, 11)
if (time == list[i]) {
data.push([i, timeDataList[j].index, 14, j])
}
}
}
let num = timeList.length * 3
if (num < 31) {
num = 31
}
option = {
legend: {
data: ['Punch Card'],
@@ -225,11 +284,8 @@
position: 'top',
formatter: function(params) {
return (
params.value[2] +
' commits in ' +
hours[params.value[0]] +
' of ' +
days[params.value[1]]
timeDataList[params.value[3]].name + '<br/>' +
timeDataList[params.value[3]].time.slice(0, 11)
)
}
},
@@ -252,7 +308,7 @@
position: 'top',
axisLabel: {
showMinLabel: true,
interval: 31,
interval: num,
textStyle: {
fontFamily: 'Blue Sky Noto',
color: '#000F16',
@@ -347,7 +403,12 @@
}
}
</script>
<style>
.box-top-text-right .ant-calendar-picker-input {
height: 38px;
width: 300px;
}
</style>
<style scoped>
@import '~@assets/less/common.less';
@@ -416,4 +477,12 @@
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2);
border-radius: 4px;
}
.box-top-text-right {
display: inline-block;
float: right;
height: 38px;
width: 300px;
margin-top: -4px;
}
</style>