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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-07-02 11:12:54 +08:00
parent 4ae082a15f ee95f79566
commit 65c25fe8cd
6 changed files with 62 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java
+14 -12
View File
@@ -22,6 +22,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -68,7 +69,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-分页列表查询")
@ApiOperation(value="参数清单-分页列表查询", notes="参数清单-分页列表查询")
@GetMapping(value = "/page")
// @RequiresPermissions("params:manifest:page")
@RequiresPermissions("params:manifest:page")
public Result<?> queryPageList(ParamsManifestEO paramsManifestEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -130,12 +131,13 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
/**
* 获取配置标识
* 判断是否可新增配置，清单参数项状态为 待发起、变更时，可添加配置
* true-可添加配置；false-不可添加配置
* @return
*/
@AutoLog(value = "参数清单-获取配置标识")
@ApiOperation(value="参数清单-获取配置标识", notes="参数清单-获取配置标识")
@GetMapping(value = "/getConfigFlag")
// @RequiresPermissions("params:manifest:page")
@RequiresPermissions("params:manifest:page")
public Result<?> getManifestConfigFlag(@RequestParam(name="paramsManifestId", required = true) String paramsManifestId) {
boolean configFlag = paramsCollectManifestEOService.getManifestConfigFlag(paramsManifestId);
return Result.OK(configFlag);
@@ -150,7 +152,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-添加")
@ApiOperation(value="参数清单-添加", notes="参数清单-添加")
@PostMapping(value = "/add")
// @RequiresPermissions("params:manifest:add")
@RequiresPermissions("params:manifest:add")
public Result<?> add(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
boolean isSuccess = paramsManifestEOService.add(paramsManifestEO);
if (isSuccess) {
@@ -169,7 +171,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-编辑")
@ApiOperation(value="参数清单-编辑", notes="参数清单-编辑")
@PostMapping(value = "/edit")
// @RequiresPermissions("params:manifest:edit")
@RequiresPermissions("params:manifest:edit")
public Result<?> edit(@Validated @RequestBody ParamsManifestEO paramsManifestEO) {
boolean isSuccess = paramsManifestEOService.editById(paramsManifestEO);
if (isSuccess) {
@@ -188,7 +190,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-通过id删除")
@ApiOperation(value="参数清单-通过id删除", notes="参数清单-通过id删除")
@GetMapping(value = "/delete")
// @RequiresPermissions("params:manifest:delete")
@RequiresPermissions("params:manifest:delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
boolean isSuccess = paramsManifestEOService.deleteById(id, cut);
if (isSuccess) {
@@ -207,7 +209,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-批量删除")
@ApiOperation(value="参数清单-批量删除", notes="参数清单-批量删除")
@PostMapping(value = "/deleteBatch")
// @RequiresPermissions("params:manifest:deleteBatch")
@RequiresPermissions("params:manifest:deleteBatch")
public Result<?> deleteBatch(@RequestBody ParamsManifestVO paramsManifestVO) {
if (StringUtils.isEmpty(paramsManifestVO.getIds()) || StringUtils.isEmpty(paramsManifestVO.getCut())) {
return Result.error("参数不能为空！");
@@ -229,7 +231,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-变更扩展")
@ApiOperation(value="参数清单-变更扩展", notes="参数清单-变更扩展")
@GetMapping(value = "/changeExtension")
// @RequiresPermissions("params:manifest:change")
@RequiresPermissions("params:manifest:change")
public Result<?> changeExtension(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) {
boolean isSuccess = paramsManifestEOService.changeExtension(id, cut);
if(isSuccess) {
@@ -248,7 +250,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-历史版本")
@ApiOperation(value="参数清单-历史版本", notes="参数清单-历史版本")
@GetMapping(value = "/history")
// @RequiresPermissions("params:manifest: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);
@@ -263,7 +265,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-查询所有项目的所有参数清单")
@ApiOperation(value="参数清单-查询所有项目的所有参数清单", notes="参数清单-查询所有项目的所有参数清单")
@PostMapping(value = "/getAllManifest")
// @RequiresPermissions("params:manifest:copy")
@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) {
@@ -280,7 +282,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-复制-参数模板列表查询")
@ApiOperation(value="参数清单-复制-参数模板列表查询", notes="参数清单-复制-参数模板列表查询")
@GetMapping(value = "/getParamsTemplatePageOfCopy")
// @RequiresPermissions("params:manifest:copy")
@RequiresPermissions("params:manifest:copy")
public Result<?> getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -299,7 +301,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-复制清单")
@ApiOperation(value="参数清单-复制清单", notes="参数清单-复制清单")
@PostMapping(value = "/copy")
// @RequiresPermissions("params:manifest:copy")
@RequiresPermissions("params:manifest:copy")
public Result<?> copy(@RequestBody ParamsManifestVO paramsManifestVO) {
ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
BeanUtils.copyProperties(paramsManifestVO, paramsManifestEO);
@@ -315,7 +317,7 @@ public class ParamsManifestEOController extends JeroController<ParamsManifestEO,
@AutoLog(value = "参数清单-判断配置列表是否为空")
@ApiOperation(value="参数清单-判断配置列表是否为空", notes="参数清单-判断配置列表是否为空")
@GetMapping(value = "/verifyConfig")
// @RequiresPermissions("params:config:list")
@RequiresPermissions("params:manifest:page")
public Result<?> queryList(@RequestParam(name = "paramsManifestId") String paramsManifestId) {
List<ParamsConfigEO> list = paramsConfigEOService.queryList(paramsManifestId);
if (CollectionUtil.isNotEmpty(list)) {
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
-3
View File
@@ -97,9 +97,6 @@ public class ParamsManifestEO implements Serializable {
@TableField(exist = false)
private String paramsTemplateName;
@TableField(exist = false)
private Boolean configFlag; // true-可添加配置；false-不可添加配置
@TableField(exist = false)
private String cut;
jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+7 -3
View File
@@ -36,6 +36,7 @@ import com.jero.modules.cert.template.service.ICertCategoryParamsInfoPublishEOSe
import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
import com.jero.modules.feishu.service.IFeishuService;
import com.jero.modules.feishu.vo.FeishuMsgVo;
import com.jero.modules.ocr.service.WebSocketServer;
import com.jero.modules.ocr.util.LineHumpUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
@@ -115,7 +116,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
private ISysUserRoleService sysUserRoleService;
@Autowired
private ProjectLibraryBaseMapper projectLibraryBaseMapper;
@Autowired
private WebSocketServer webSocketServer;
@@ -1552,8 +1554,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
updateParamsManifestEO.setId(paramsManifestId);
updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue());
updateParamsManifestEO.setFinishTime(time);
paramsManifestEOService.updateById(updateParamsManifestEO);
boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO);
if (isSuccess2) {
webSocketServer.sendMessage();
}
}
return isSuccess;
jero-web/src/components/CollectionType/index.vue
+25 -1
View File
@@ -18,6 +18,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -163,6 +164,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -170,6 +172,7 @@
<!-- 中文-->
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -256,6 +259,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -263,6 +267,7 @@
<!-- 中文-->
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -359,6 +364,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -366,6 +372,7 @@
<!-- 中文-->
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
@@ -493,7 +500,7 @@
<a-select v-model="item.dataValue" class='selectWid' :disabled="item.isLock == '1' ? true: false"
allowClear>
<a-select-option v-for="(itemin, key) in item.controlValue" :key="key" :value="itemin.value">
<span style="display: inline-block;width: 100%" :title=" itemin.label ">
<span style="display: inline-block;width: 100%" class="itemOption" :title=" itemin.label ">
{{ itemin.label }}
</span>
</a-select-option>
@@ -513,6 +520,7 @@
<!-- 无 -->
<div v-if="item.controlVerify == '1'">
<a-input class="box-input inputWid"
:maxLength="1000"
:disabled="item.isLock == '1' ? true: false"
:placeholder="$t('pleaseEnter')"
v-model="item.dataValue"/>
@@ -521,6 +529,7 @@
<div v-if="item.controlVerify == '2'">
<a-input class="box-input inputWid"
:disabled="item.isLock == '1' ? true: false"
:maxLength="1000"
:placeholder="$t('pleaseEnter')+$t('chinese')"
onkeyup="value=value.replace(/[^\u4e00-\u9fa5]/g,'')"
v-model="item.dataValue"/>
@@ -694,6 +703,13 @@
.ant-table td {
white-space: nowrap;
}
.selectWid .ant-select-selection--multiple {
overflow: auto;
}
.selectWid .ant-select-selection--multiple::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
</style>
<style lang="less" scoped>
.box {
@@ -747,4 +763,12 @@
.ant-select-disabled{
color: rgba(0, 0, 0, 0.65);
}
.itemOption {
display: inline-block;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
</style>
jero-web/src/components/tableCollection/index.vue
+2 -2
View File
@@ -375,10 +375,10 @@
this.areaVisible = true
// this.$refs.ruleForm.clearValidate()
this.$nextTick(() => {
this.Dateline = {...this.Dateline}
this.getquerySdtList(record)
this.$refs.ruleForm.clearValidate()
})
this.$refs.ruleForm.clearValidate()
},
dataValueTobeinitiated() {
this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission'))
jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+14 -13
View File
@@ -983,30 +983,31 @@
ishandleSubmit() {
let _this = this
let postDate = []
for (let i = 0; i < this.selectedRowKeysValue.length; i++) {
let selectedRowKeysValue = JSON.parse(JSON.stringify(this.selectedRowKeysValue))
for (let i = 0; i < selectedRowKeysValue.length; i++) {
let postDateobj = {}
let itemIn = Object.keys(this.selectedRowKeysValue[i])
let itemIn = Object.keys(selectedRowKeysValue[i])
for (let j = 0; j < itemIn.length; j++) {
if (itemIn[j] !== 'sdt') {
if (this.selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(this.selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = this.selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < this.selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
if (selectedRowKeysValue[i][itemIn[j]] instanceof Object && !(selectedRowKeysValue[i][itemIn[j]] instanceof Array)) {
postDateobj[itemIn[j]] = selectedRowKeysValue[i][itemIn[j]]
for (let k = 0; k < selectedRowKeysValue[i][itemIn[j]].list.length; k++) {
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'pull_more') {
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.join(',')
}
if (this.selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
if (selectedRowKeysValue[i][itemIn[j]].list[k].type == 'text' && selectedRowKeysValue[i][itemIn[j]].list[k].dataValue !== null) {
selectedRowKeysValue[i][itemIn[j]].list[k].dataValue = selectedRowKeysValue[i][itemIn[j]].list[k].dataValue.toString()
}
if (!this.selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && this.selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
&& this.selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
this.$message.warning(this.selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
if (!selectedRowKeysValue[i][itemIn[j]].list[k].dataValue && selectedRowKeysValue[i][itemIn[j]].list[k].isMust == '1'
&& selectedRowKeysValue[i][itemIn[j]].list[k].isLock == '0') {
this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty'))
return
}
}
}
}
}
postDateobj.id = this.selectedRowKeysValue[i].id
postDateobj.id = selectedRowKeysValue[i].id
postDate.push(postDateobj)
}