suzhou-jichuang-lanhai
/
TcAssetVerificationJava
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

管理端审核代码修改

Browse Source
main
dongdingding 4 weeks ago
parent 9ac02bffb9
commit b506a87980
7 changed files with 1351 additions and 142 deletions
Show Stats Download Patch File Download Diff File

8
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java
Unescape View File

@ -167,8 +167,14 @@ public class AssetAppController extends BaseController {
AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId());
AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
if (byId.getAssetId()==null){
assetAppService.save(aa);
}else {
assetAppService.updateById(aa);
}
//修改子表重的资产id
byId.setAssetId(aa.getId());
assetAppJyService.updateById(byId);
//任务同步
taskTb(byId);
}

224
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
Unescape View File

@ -144,9 +144,8 @@ public class AssetCurrentController extends BaseController {
*/
@ApiOperation(value = "新增数据")
@PostMapping
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@Transactional(rollbackFor = Exception.class)
public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) {
public AjaxResult insert(@RequestBody AssetCurrent assetCurrent) {
if (assetCurrent.getXzType() == 1) {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrent.getDwmc()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
@ -163,6 +162,7 @@ public class AssetCurrentController extends BaseController {
BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
assetCurrentCpPo.setAuditState("1");
assetCurrentCpPo.setXzType(1);
assetCurrentCpPo.setId(null);
assetCurrentCpService.save(assetCurrentCpPo);
//新增新监管业务形态
//根据资产id查询新监管业务形态主表id
@ -193,8 +193,6 @@ public class AssetCurrentController extends BaseController {
}
} else {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrent.getDwmc()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
@ -340,7 +338,6 @@ public class AssetCurrentController extends BaseController {
if (one != null) {
assetCurrentJyPo.setCurrentId(one.getCurrentId());
assetCurrentJyService.updateById(assetCurrentJyPo);
QueryWrapper<AssetSupplyChainJyPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", assetCurrentJyPo.getId());
queryWrapper2.isNull("task_id");
@ -384,9 +381,27 @@ public class AssetCurrentController extends BaseController {
}
} else {
AssetCurrentJyPo two = assetCurrentJyService.lambdaQuery().eq(AssetCurrentJyPo::getXtmc, assetCurrentJyPo.getXtmc()).eq(AssetCurrentJyPo::getDwmc, assetCurrentJyPo.getDwmc()).one();
AssetCurrentCpPo acc = new AssetCurrentCpPo();
BeanUtil.copyProperties(assetCurrentJyPo, acc);
assetCurrentCpService.save(acc);
acc.setCurrentId(two.getCurrentId());
assetCurrentCpService.updateById(acc);
QueryWrapper<AssetSupplyChainJyPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", assetCurrentJyPo.getId());
queryWrapper2.eq("task_id", two.getTaskId());
assetSupplyChainJyService.remove(queryWrapper2);
QueryWrapper<AssetBasicNetworkJyPo> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("asset_id", assetCurrentJyPo.getId());
queryWrapper2.eq("task_id", two.getTaskId());
assetBasicNetworkJyService.remove(queryWrapper3);
QueryWrapper<AssetBusinessFormJyPo> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.eq("asset_id", assetCurrentJyPo.getId());
queryWrapper2.eq("task_id", two.getTaskId());
assetBusinessFormJyService.remove(queryWrapper4);
QueryWrapper<UnitOtherConcatJyPo> queryWrapper5 = new QueryWrapper<>();
queryWrapper2.eq("task_id", two.getTaskId());
queryWrapper5.eq("asset_id", assetCurrentJyPo.getId());
unitOtherConcatJyservice.remove(queryWrapper5);
if (acc.getXjgywxt() != null) {
acc.getXjgywxt().setAssetId(acc.getId());
assetBusinessFormCpService.save(acc.getXjgywxt());
@ -446,10 +461,28 @@ public class AssetCurrentController extends BaseController {
@GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) {
AssetCurrentCpPo byId = assetCurrentCpService.getById(id);
byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list());
if (byId.getId() != null) {
byId.setGylxxList(assetSupplyChainCpService
.lambdaQuery()
.eq(AssetSupplyChainCpPo::getAssetId, byId.getId())
.isNull(AssetSupplyChainCpPo::getTaskId)
.list());
byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list());
byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).one());
byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list());
} else {
byId.setGylxxList(assetSupplyChainCpService
.lambdaQuery()
.eq(AssetSupplyChainCpPo::getCreateBy, byId.getDwmc())
.isNull(AssetSupplyChainCpPo::getAssetId) // 或者根据实际逻辑选择其他条件
.isNull(AssetSupplyChainCpPo::getTaskId)
.list());
byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getCreateBy, byId.getDwmc()).isNull(AssetBasicNetworkCpPo::getAssetId).isNull(AssetBasicNetworkCpPo::getTaskId).list());
byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getCreateBy, byId.getDwmc()).isNull(AssetBusinessFormCpPo::getAssetId).isNull(AssetBusinessFormCpPo::getTaskId).one());
byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getCreateBy, byId.getDwmc()).isNull(UnitOtherConcatCpPo::getAssetId).isNull(UnitOtherConcatCpPo::getTaskId).list());
}
List<Acomma> a1 = new ArrayList<>();
if (byId.getGlym() != null) {
Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
@ -507,30 +540,13 @@ public class AssetCurrentController extends BaseController {
assetCurrentCpService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
//管理端填报
AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId());
AssetCurrent assetCurrent = new AssetCurrent();
BeanUtil.copyProperties(byId, assetCurrent);
//修改主表
assetCurrentService.updateById(assetCurrent);
//删除副表数据然后再添加
Result result = getResult(assetCurrent, byId);
//如果有任务也修改任务这边
taskTb(byId, result.list, result.list1, result.list2, result.list3);
} else {
AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId());
AssetCurrent assetCurrent = new AssetCurrent();
BeanUtil.copyProperties(byId, assetCurrent);
//修改主表
assetCurrentService.save(assetCurrent);
//删除副表数据然后再添加
Result result = getResult(assetCurrent, byId);
//如果有任务也修改任务这边
taskTb(byId, result.list, result.list1, result.list2, result.list3);
}
return success();
}
private Result getResult(AssetCurrent assetCurrent, AssetCurrentCpPo byId) {
assetSupplyChainService.deleteByAssetIds(assetCurrent.getId());
assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
@ -563,25 +579,7 @@ public class AssetCurrentController extends BaseController {
BeanUtil.copyProperties(x, a4);
unitOtherConcatService.save(a4);
});
Result result = new Result(list, list1, list2, list3);
return result;
}
private static class Result {
public final List<AssetSupplyChainCpPo> list;
public final List<AssetBasicNetworkCpPo> list1;
public final List<AssetBusinessFormCpPo> list2;
public final List<UnitOtherConcatCpPo> list3;
public Result(List<AssetSupplyChainCpPo> list, List<AssetBasicNetworkCpPo> list1, List<AssetBusinessFormCpPo> list2, List<UnitOtherConcatCpPo> list3) {
this.list = list;
this.list1 = list1;
this.list2 = list2;
this.list3 = list3;
}
}
private void taskTb(AssetCurrentCpPo byId, List<AssetSupplyChainCpPo> list, List<AssetBasicNetworkCpPo> list1, List<AssetBusinessFormCpPo> list2, List<UnitOtherConcatCpPo> list3) {
//如果有任务也修改任务这边
AssetCurrentCpPo one = assetCurrentCpService.lambdaQuery().isNotNull(AssetCurrentCpPo::getTaskId).ne(AssetCurrentCpPo::getStatus, 5).eq(AssetCurrentCpPo::getId, byId.getId()).one();
if (one != null) {
Integer taskId = one.getTaskId();
@ -594,7 +592,6 @@ public class AssetCurrentController extends BaseController {
one.setAuditYy(null);
one.setStatus(status);
assetCurrentCpService.updateById(one);
QueryWrapper<AssetSupplyChainCpPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", one.getId());
queryWrapper2.eq("task_id", taskId);
@ -628,22 +625,137 @@ public class AssetCurrentController extends BaseController {
unitOtherConcatCpService.save(x);
});
}
} else if ("2".equals(as.getAuditState())) {
//单位端填报
AssetCurrentCpPo byId = assetCurrentCpService
.lambdaQuery()
.isNull(AssetCurrentCpPo::getId)
.one();
if (byId == null) {
//新增资产修改
AssetCurrentCpPo finalById = assetCurrentCpService
.lambdaQuery()
.eq(AssetCurrentCpPo::getCurrentId, as.getCurrentId())
.one();
//查询该单位下是否有任务
AssetTask assetTask = assetTaskService.lambdaQuery().like(AssetTask::getDwmc, finalById.getCreateBy()).eq(AssetTask::getTaskStatus, 1).one();
Integer taskId;
if (assetTask != null) {
taskId = assetTask.getId();
} else {
taskId = null;
}
AssetCurrent assetCurrent = new AssetCurrent();
BeanUtil.copyProperties(finalById, assetCurrent);
//修改主表
assetCurrentService.updateById(assetCurrent);
//修改子表重的资产id
finalById.setTaskId(taskId);
assetCurrentCpService.updateById(finalById);
private static class deleteFb {
public final List<AssetSupplyChainCpPo> list;
public final List<AssetBasicNetworkCpPo> list1;
public final List<AssetBusinessFormCpPo> list2;
public final List<UnitOtherConcatCpPo> list3;
List<AssetSupplyChainCpPo> list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, finalById.getId()).list();
list.forEach(x -> {
AssetSupplyChain a1 = new AssetSupplyChain();
BeanUtil.copyProperties(x, a1);
x.setTaskId(taskId);
assetSupplyChainCpService.updateById(x);
assetSupplyChainService.updateById(a1);
});
public deleteFb(List<AssetSupplyChainCpPo> list, List<AssetBasicNetworkCpPo> list1, List<AssetBusinessFormCpPo> list2, List<UnitOtherConcatCpPo> list3) {
this.list = list;
this.list1 = list1;
this.list2 = list2;
this.list3 = list3;
List<AssetBasicNetworkCpPo> list1 = assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, finalById.getId()).list();
list1.forEach(x -> {
AssetBasicNetwork a2 = new AssetBasicNetwork();
BeanUtil.copyProperties(x, a2);
x.setTaskId(taskId);
assetBasicNetworkCpService.updateById(x);
assetBasicNetworkService.updateById(a2);
});
List<AssetBusinessFormCpPo> list2 = assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, finalById.getId()).list();
list2.forEach(x -> {
AssetBusinessForm a3 = new AssetBusinessForm();
BeanUtil.copyProperties(x, a3);
x.setTaskId(taskId);
assetBusinessFormCpService.updateById(x);
assetBusinessFormService.updateById(a3);
});
List<UnitOtherConcatCpPo> list3 = unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, finalById.getId()).list();
list3.forEach(x -> {
UnitOtherConcat a4 = new UnitOtherConcat();
BeanUtil.copyProperties(x, a4);
x.setTaskId(taskId);
unitOtherConcatCpService.updateById(x);
unitOtherConcatService.updateById(a4);
});
} else {
//查询该单位下是否有任务
AssetTask assetTask = assetTaskService.lambdaQuery().like(AssetTask::getDwmc, byId.getCreateBy()).eq(AssetTask::getTaskStatus, 1).one();
Integer taskId;
if (assetTask != null) {
taskId = assetTask.getId();
} else {
taskId = null;
}
//新增资产
AssetCurrent assetCurrent = new AssetCurrent();
BeanUtil.copyProperties(byId, assetCurrent);
assetCurrentService.save(assetCurrent);
//修改子表重的资产id
byId.setId(assetCurrent.getId());
byId.setTaskId(taskId);
assetCurrentCpService.updateById(byId);
List<AssetSupplyChainCpPo> list = assetSupplyChainCpService.lambdaQuery().isNull(AssetSupplyChainCpPo::getAssetId).isNull(AssetSupplyChainCpPo::getTaskId).list();
list.forEach(x -> {
AssetSupplyChain a1 = new AssetSupplyChain();
BeanUtil.copyProperties(x, a1);
a1.setAssetId(byId.getId());
x.setAssetId(byId.getId());
x.setTaskId(taskId);
assetSupplyChainCpService.updateById(x);
assetSupplyChainService.save(a1);
});
List<AssetBasicNetworkCpPo> list1 = assetBasicNetworkCpService.lambdaQuery().isNull(AssetBasicNetworkCpPo::getAssetId).isNull(AssetBasicNetworkCpPo::getTaskId).list();
list1.forEach(x -> {
AssetBasicNetwork a2 = new AssetBasicNetwork();
BeanUtil.copyProperties(x, a2);
a2.setAssetId(byId.getId());
x.setAssetId(byId.getId());
x.setTaskId(taskId);
assetBasicNetworkCpService.updateById(x);
assetBasicNetworkService.save(a2);
});
List<AssetBusinessFormCpPo> list2 = assetBusinessFormCpService.lambdaQuery().isNull(AssetBusinessFormCpPo::getAssetId).isNull(AssetBusinessFormCpPo::getTaskId).list();
list2.forEach(x -> {
AssetBusinessForm a3 = new AssetBusinessForm();
BeanUtil.copyProperties(x, a3);
a3.setAssetId(byId.getId());
x.setAssetId(byId.getId());
x.setTaskId(taskId);
assetBusinessFormCpService.updateById(x);
assetBusinessFormService.save(a3);
});
List<UnitOtherConcatCpPo> list3 = unitOtherConcatCpService.lambdaQuery().isNull(UnitOtherConcatCpPo::getAssetId).isNull(UnitOtherConcatCpPo::getTaskId).list();
list3.forEach(x -> {
UnitOtherConcat a4 = new UnitOtherConcat();
BeanUtil.copyProperties(x, a4);
a4.setAssetId(byId.getId());
x.setAssetId(byId.getId());
x.setTaskId(taskId);
unitOtherConcatCpService.updateById(x);
unitOtherConcatService.save(a4);
});
}
}
return success();
}
//=================================================
/**

8
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java
Unescape View File

@ -175,8 +175,14 @@ public class AssetEmailController extends BaseController {
AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
if (byId.getAssetId()==null){
assetEmailService.save(aa);
}else {
assetEmailService.updateById(aa);
}
//修改子表重的资产id
byId.setAssetId(aa.getId());
assetEmailJyService.updateById(byId);
//任务同步
taskTb(byId);
}

15
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java
Unescape View File

@ -161,7 +161,7 @@ public class AssetMiniProgramsController extends BaseController {
ass.setMiniId(as.getCurrentId());
assetMiniProgramsJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState()) && as.getXzType()!=1) {
if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
@ -170,12 +170,19 @@ public class AssetMiniProgramsController extends BaseController {
assetMiniProgramsService.updateById(aa);
//任务同步
taskTb(byId);
}else {
} else {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
if (byId.getAssetId()==null){
assetMiniProgramsService.save(aa);
}else {
assetMiniProgramsService.updateById(aa);
}
//修改子表重的资产id
byId.setAssetId(aa.getId());
assetMiniProgramsJyService.updateById(byId);
//任务同步
taskTb(byId);
}
@ -241,8 +248,6 @@ public class AssetMiniProgramsController extends BaseController {
}
/**
* 编辑小程序数据
*

9
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java
Unescape View File

@ -248,9 +248,14 @@ public class AssetOfficialAccountController {
AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
if (byId.getAssetId()==null){
assetOfficialAccountService.save(aa);
}else {
assetOfficialAccountService.updateById(aa);
}
//修改子表重的资产id
byId.setAssetId(aa.getId());
assetOfficialAccountJyService.updateById(byId);
//任务同步
taskTb(byId);
}

2
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java
Unescape View File

@ -1,5 +1,6 @@
package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -28,6 +29,7 @@ public class AssetTask implements Serializable {
* 任务编号
*/
@ApiModelProperty("任务编号")
@TableField(exist = false)
private String taskId;
/**
* 任务名称

1073
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/dto/AssetCurrentCpDto.java
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save