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

修改参数模版发布

Browse Source
This commit is contained in:
gaosong
2023-11-21 17:57:17 +08:00
parent cc4e548d0f
commit 021b841c3c
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java
+1 -3
View File
@@ -283,9 +283,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsCollectManifestEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid); queryWrapper.eq(ParamsCollectManifestEO::getParamsManifestId, cid);
List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper); List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOService.list(queryWrapper);
for (ParamsCollectManifestEO peo:paramsCollectManifestEOList) {
peo.setState(CollectManifestStateEnum.WAIT_FILL.getValue());
}
// 根据参数模板id发布版本查询对应参数项集合 // 根据参数模板id发布版本查询对应参数项集合
List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version)); List<ParamsInfoPublishEO> paramsInfoPublishEOList = paramsInfoPublishEOService.getListByPublishVersion(mid, Integer.parseInt(version));
@@ -310,6 +307,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
target.setControlValues(source.getControlValues()); target.setControlValues(source.getControlValues());
target.setControlVerify(source.getControlVerify()); target.setControlVerify(source.getControlVerify());
target.setFileTemplateConnectId(source.getFileTemplateConnectId()); target.setFileTemplateConnectId(source.getFileTemplateConnectId());
target.setDescription(source.getDescription());
break; break;
} }
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+2 -2
View File
@@ -434,7 +434,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>(); List<ProjectLawsInventoryEO> projectLawsInventoryEOListTemp = new ArrayList<>();
for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) { for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOListNew) {
List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream() List<ProjectLawsInventoryEO> collect = projectLawsInventoryEOList.stream()
.filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())&&e.getDutyTerritory().equals(dummyInventoryInfoEO.getDutyTerritory())).collect(Collectors.toList());
if (collect.size() != 0) { if (collect.size() != 0) {
for (ProjectLawsInventoryEO lawsInventoryEO : collect) { for (ProjectLawsInventoryEO lawsInventoryEO : collect) {
//数据对比 //数据对比
@@ -3715,7 +3715,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) { private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO, DummyInventoryInfoEO dummyInventoryInfoEO) {
//编号 //编号
if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) { if (StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())) {
projectLawsInventoryEO.setSendMsgFlag(dummyInventoryInfoEO.getSerialNumber()); projectLawsInventoryEO.setSerialNumber(dummyInventoryInfoEO.getSerialNumber());
} }
//标题 //标题
if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) { if (StringUtils.isBlank(projectLawsInventoryEO.getTitle())) {
jero-web/src/views/parameter/ParameterTemplate/index.vue
+4 -3
View File
@@ -69,13 +69,14 @@
{{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }} {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }}
</span> </span>
<span slot="operation" slot-scope="text,record"> <span slot="operation" slot-scope="text,record">
<a class="text-operation" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a> <a class="text-operation" :disabled="record.status == '1' ? true : false" v-has="'params:template:edit'" @click="edit(record)">{{$t('edit')}}</a>
<a class="text-operation" <a class="text-operation"
v-has="'params:template:publish'" v-has="'params:template:publish'"
@click="withdrawOrRelease(record)">{{record.status && record.status == '1'? $t('withdraw') : $t('release')}}</a> @click="withdrawOrRelease(record)">{{record.status && record.status == '1'? $t('withdraw') : $t('release')}}</a>
<a class="text-operation" v-has="'params:template:maintenanceTemplate'" <a class="text-operation" :disabled="record.status == '1' ? true : false" v-has="'params:template:maintenanceTemplate'"
@click="maintenanceTemplateClick(record)">{{$t('maintenanceTemplate')}}</a> @click="maintenanceTemplateClick(record)">{{$t('maintenanceTemplate')}}</a>
<a class="text-operation" v-has="'params:template:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a> <a class="text-operation" :disabled="record.status == '1' ? true : false"
v-has="'params:template:delete'" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
</span> </span>
</a-table> </a-table>
</div> </div>