管理端审核代码修改

main
dongdingding 4 months ago
parent 623b0c657a
commit 0456470ece

@ -2,7 +2,6 @@ package com.ruoyi.tc.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@ -11,9 +10,9 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.*;
import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.request.Acomma;
import com.ruoyi.tc.entity.AssetApp;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAppPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest;
@ -28,12 +27,8 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static com.ruoyi.common.core.domain.AjaxResult.success;
/**
* (asset_app)
*
@ -60,6 +55,7 @@ public class AssetAppController extends BaseController {
@Resource
private UnitService unitService;
/**
*
*
@ -82,6 +78,7 @@ public class AssetAppController extends BaseController {
return success(assetAppService.page(page, req));
}
//=================================================
/**
*
*/
@ -157,13 +154,28 @@ public class AssetAppController extends BaseController {
ass.setAppId(as.getCurrentId());
assetAppJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId());
AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetAppService.updateById(aa);
//任务同步
taskTb(byId);
}else{
AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId());
AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
assetAppService.save(aa);
//任务同步
taskTb(byId);
}
return success();
}
private void taskTb(AssetAppJyPo byId) {
//如果有任务也修改任务这边
AssetAppJyPo one = assetAppJyService.lambdaQuery()
.isNotNull(AssetAppJyPo::getTaskId)
@ -182,8 +194,6 @@ public class AssetAppController extends BaseController {
assetAppJyService.updateById(one);
}
}
return success();
}
//=================================================
/**

@ -147,6 +147,53 @@ public class AssetCurrentController extends BaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@Transactional(rollbackFor = Exception.class)
public AjaxResult insert(@RequestBody @Valid 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()) {
throw new ServiceException("请选择已有单位!");
}
List<AssetCurrent> list1 = assetCurrentService.lambdaQuery().eq(AssetCurrent::getXtmc, assetCurrent.getXtmc()).eq(AssetCurrent::getDwmc, assetCurrent.getDwmc()).list();
if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!");
}
//获取新增资产id
Long id = assetCurrent.getId();
//新增资产复制主表
AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
assetCurrentCpPo.setAuditState("1");
assetCurrentCpPo.setXzType(1);
assetCurrentCpService.save(assetCurrentCpPo);
//新增新监管业务形态
//根据资产id查询新监管业务形态主表id
if (assetCurrent.getXjgywxt() != null) {
assetCurrentCpPo.getXjgywxt().setAssetId(id);
assetBusinessFormCpService.save(assetCurrentCpPo.getXjgywxt());
}
if (assetCurrent.getGylxxList() != null) {
for (AssetSupplyChainCpPo items : assetCurrentCpPo.getGylxxList()) {
items.setAssetId(id);
}
//新增供应链
assetSupplyChainCpService.saveBatch(assetCurrentCpPo.getGylxxList());
}
if (assetCurrent.getJcwlList() != null) {
for (AssetBasicNetworkCpPo items : assetCurrentCpPo.getJcwlList()) {
items.setAssetId(assetCurrent.getId());
}
//新增基础网络
assetBasicNetworkCpService.saveBatch(assetCurrentCpPo.getJcwlList());
}
if (assetCurrent.getOtherConcat() != null) {
for (UnitOtherConcatCpPo items : assetCurrentCpPo.getOtherConcat()) {
items.setAssetId(assetCurrent.getId());
}
//新增其他联系人
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
}
} else {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrent.getDwmc()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
@ -269,6 +316,7 @@ public class AssetCurrentController extends BaseController {
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
}
}
}
return success();
}
@ -458,13 +506,31 @@ public class AssetCurrentController extends BaseController {
BeanUtil.copyProperties(as, ass);
assetCurrentCpService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
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());
@ -497,7 +563,25 @@ 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();
@ -545,7 +629,19 @@ public class AssetCurrentController extends BaseController {
});
}
}
return success();
private static class deleteFb {
public final List<AssetSupplyChainCpPo> list;
public final List<AssetBasicNetworkCpPo> list1;
public final List<AssetBusinessFormCpPo> list2;
public final List<UnitOtherConcatCpPo> list3;
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;
}
}
//=================================================

@ -162,13 +162,28 @@ public class AssetEmailController extends BaseController {
ass.setEmailId(as.getCurrentId());
assetEmailJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetEmailService.updateById(aa);
//任务同步
taskTb(byId);
}else{
AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
assetEmailService.save(aa);
//任务同步
taskTb(byId);
}
return success();
}
private void taskTb(AssetEmailJyPo byId) {
//如果有任务也修改任务这边
AssetEmailJyPo one = assetEmailJyService.lambdaQuery()
.isNotNull(AssetEmailJyPo::getTaskId)
@ -187,8 +202,6 @@ public class AssetEmailController extends BaseController {
assetEmailJyService.updateById(one);
}
}
return success();
}
//=================================================
/**

@ -161,13 +161,28 @@ public class AssetMiniProgramsController extends BaseController {
ass.setMiniId(as.getCurrentId());
assetMiniProgramsJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
if ("2".equals(as.getAuditState()) && as.getXzType()!=1) {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetMiniProgramsService.updateById(aa);
//任务同步
taskTb(byId);
}else {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
assetMiniProgramsService.save(aa);
//任务同步
taskTb(byId);
}
return success();
}
private void taskTb(AssetMiniProgramsJyPo byId) {
//如果有任务也修改任务这边
AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery()
.isNotNull(AssetMiniProgramsJyPo::getTaskId)
@ -186,7 +201,16 @@ public class AssetMiniProgramsController extends BaseController {
assetMiniProgramsJyService.updateById(one);
}
}
return success();
private void tb(AssetAuditRequest as) {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetMiniProgramsService.updateById(aa);
//如果有任务也修改任务这边
taskTb(byId);
}
//=================================================
@ -204,18 +228,21 @@ public class AssetMiniProgramsController extends BaseController {
}
/**
*
*
*
* @param assetMiniPrograms
* @return
*/
@ApiOperation(value = "新增小程序数据")
@ApiOperation(value = "管理端新增小程序数据")
@PostMapping
@Log(title = "新增小程序数据", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody AssetMiniPrograms assetMiniPrograms) {
return success(assetMiniProgramsService.add(assetMiniPrograms));
}
/**
*
*

@ -235,13 +235,29 @@ public class AssetOfficialAccountController {
ass.setAccountId(as.getCurrentId());
assetOfficialAccountJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
if ("2".equals(as.getAuditState()) && as.getXzType()!=1) {
AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetOfficialAccountService.updateById(aa);
//任务同步
taskTb(byId);
}else{
AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetOfficialAccountService.save(aa);
//任务同步
taskTb(byId);
}
return success();
}
private void taskTb(AssetOfficialAccountJyPo byId) {
//如果有任务也修改任务这边
AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery()
.isNotNull(AssetOfficialAccountJyPo::getTaskId)
@ -260,8 +276,6 @@ public class AssetOfficialAccountController {
assetOfficialAccountJyService.updateById(one);
}
}
return success();
}
//=================================================
/**

@ -26,4 +26,11 @@ public class AssetAuditRequest {
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
/**
*
*/
@ApiModelProperty("类型0:管理端1单位端")
private Integer xzType=0;
}

@ -55,7 +55,7 @@ public interface AssetMiniProgramsService extends IService<AssetMiniPrograms> {
void deleteIdList(List<Long> idList);
/**
*
*
*
* @param assetMiniPrograms
* @return

@ -18,9 +18,6 @@ import com.ruoyi.tc.service.UnitService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
/**
@ -95,6 +92,26 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
*/
@Override
public Boolean add(AssetApp assetApp) {
if (assetApp.getXzType() == 1) {
//单位端新增做校验
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetApp.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
}
List<AssetApp> list1 = lambdaQuery().eq(AssetApp::getSsdw, assetApp.getSsdw())
.eq(AssetApp::getAppName, assetApp.getAppName()).list();
if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!");
}
AssetAppCpPo a = new AssetAppCpPo();
BeanUtil.copyProperties(assetApp, a);
a.setAuditState("1");
a.setXzType(1);
a.setAssetId(assetApp.getId());
assetAppCpService.save(a);
}else{
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetApp.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
@ -115,6 +132,8 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
a.setAssetId(assetApp.getId());
assetAppCpService.save(a);
}
}
return true;
}

@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.tc.entity.AssetCurrent;
import com.ruoyi.tc.entity.AssetEmail;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
import com.ruoyi.tc.mapper.AssetEmailMapper;
@ -95,7 +92,28 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
@Override
public Boolean add(AssetEmail assetEmail) {
if (assetEmail.getXzType() == 1) {
//单位端新增做校验
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetEmail.getSsdw())
.eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
}
List<AssetEmail> list1 = lambdaQuery().eq(AssetEmail::getSsdw, assetEmail.getSsdw())
.eq(AssetEmail::getDzyxhz, assetEmail.getDzyxhz()).list();
if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!");
}
AssetEmailCpPo a = new AssetEmailCpPo();
BeanUtil.copyProperties(assetEmail, a);
a.setXzType(1);
a.setAuditState("1");
a.setXzType(1);
a.setAssetId(assetEmail.getId());
assetEmailCpService.save(a);
}else{
//管理端
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetEmail.getSsdw())
.eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
@ -116,6 +134,8 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
a.setAssetId(assetEmail.getId());
assetEmailCpService.save(a);
}
}
return true;
}

@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.tc.entity.AssetMiniPrograms;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest;
import com.ruoyi.tc.mapper.AssetMiniProgramsMapper;
@ -78,13 +76,32 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
}
/**
*
*
*
* @param assetMiniPrograms
* @return
*/
@Override
public Boolean add(AssetMiniPrograms assetMiniPrograms) {
if (assetMiniPrograms.getXzType() == 1) {
//单位端新增做校验
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetMiniPrograms.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
}
List<AssetMiniPrograms> list1 = lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniPrograms.getSsdw())
.eq(AssetMiniPrograms::getXcxmc, assetMiniPrograms.getXcxmc()).list();
if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!");
}
AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
BeanUtil.copyProperties(assetMiniPrograms, assetMiniProgramsCpPo);
assetMiniProgramsCpPo.setXzType(1);
assetMiniProgramsCpPo.setAuditState("1");
assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
} else {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetMiniPrograms.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
@ -101,10 +118,11 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
Integer i = unitService.selectTaskId(assetMiniPrograms.getSsdw(), "1");
if (i != null) {
assetMiniProgramsCpPo.setTaskId(i);
assetMiniProgramsCpPo.setXzType(1);
assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
}
}
return true;
}
@ -123,7 +141,6 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
}
updateById(assetMiniPrograms);
List<AssetMiniProgramsCpPo> list = assetMiniProgramsCpService.lambdaQuery()
.eq(AssetMiniProgramsCpPo::getAssetId, assetMiniPrograms.getId()).list();

@ -6,9 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.tc.entity.AssetOfficialAccount;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
import com.ruoyi.tc.mapper.AssetOfficialAccountMapper;
@ -88,12 +86,49 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
*/
@Override
public Boolean add(AssetOfficialAccount assetOfficialAccount) {
// List<Unit> list3 = unitService.lambdaQuery()
// .eq(Unit::getNickName, assetOfficialAccount.getSsdw()).eq(Unit::getDelFlag, 0).list();
// if (list3 == null || list3.isEmpty()) {
// throw new ServiceException("请选择已有单位!");
// }
if (assetOfficialAccount.getXzType() == 1) {
List<AssetOfficialAccount> list1 = lambdaQuery()
.eq(AssetOfficialAccount::getSsdw, assetOfficialAccount.getSsdw())
.eq(AssetOfficialAccount::getGzhmc, assetOfficialAccount.getGzhmc()).list();
if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!");
}
if (assetOfficialAccount.getCdList() != null && !assetOfficialAccount.getCdList().isEmpty()) {
StringBuilder a = new StringBuilder();
StringBuilder b = new StringBuilder();
StringBuilder c = new StringBuilder();
assetOfficialAccount.getCdList().forEach(x -> {
if (!Objects.equals(x.getCdmc(), "") && x.getCdmc() != null) {
a.append(x.getCdmc()).append("|");
}
if (!Objects.equals(x.getCdlj(), "") && x.getCdlj() != null) {
b.append(x.getCdlj()).append("|");
}
if (!Objects.equals(x.getCdlx(), "") && x.getCdlx() != null) {
c.append(x.getCdlx()).append("|");
}
});
assetOfficialAccount.setCdmc(a.toString());
assetOfficialAccount.setCdlj(b.toString());
assetOfficialAccount.setCdlx(c.toString());
}
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetOfficialAccount.getSsdw())
.eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!");
}
AssetOfficialAccountCpPo a = new AssetOfficialAccountCpPo();
BeanUtil.copyProperties(assetOfficialAccount, a);
a.setAssetId(assetOfficialAccount.getId());
a.setXzType(1);
a.setAuditState("1");
assetOfficialAccountCpService.save(a);
} else {
List<AssetOfficialAccount> list1 = lambdaQuery()
.eq(AssetOfficialAccount::getSsdw, assetOfficialAccount.getSsdw())
.eq(AssetOfficialAccount::getGzhmc, assetOfficialAccount.getGzhmc()).list();
@ -137,6 +172,8 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
a.setXzType(1);
assetOfficialAccountCpService.save(a);
}
}
return true;
}

@ -4,7 +4,7 @@
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetAppJyPo">
select a.* from asset_app_cp a
<where>
a.task_id is null or xz_type=1
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.app_name like concat('%',#{req.name},'%')
</if>
@ -14,6 +14,7 @@
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
or xz_type=1
</where>
order by a.create_time desc
</select>

@ -4,7 +4,7 @@
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetCurrentJyPo">
select a.* from asset_current_cp a
<where>
a.task_id is null or xz_type=1
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.xtmc like concat('%',#{req.name},'%')
</if>
@ -14,6 +14,7 @@
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
or xz_type=1
</where>
order by a.create_time desc
</select>

@ -4,7 +4,7 @@
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetEmailJyPo">
select a.* from asset_email_cp a
<where>
a.task_id is null or xz_type=1
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.dzyxhz like concat('%',#{req.name},'%')
</if>
@ -14,6 +14,7 @@
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
or xz_type=1
</where>
order by a.create_time desc
</select>

@ -4,7 +4,7 @@
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo">
select a.* from asset_mini_programs_cp a
<where>
a.task_id is null or xz_type=1
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.xcxmc like concat('%',#{req.name},'%')
</if>
@ -14,6 +14,7 @@
<if test="req.auditState!=null">
and a.audit_state = #{req.auditState}
</if>
or xz_type=1
</where>
order by a.create_time desc
</select>

@ -4,7 +4,7 @@
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo">
select a.* from asset_official_account_cp a
<where>
a.task_id is null or xz_type=1
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.gzhmc like concat('%',#{req.name},'%')
</if>
@ -14,6 +14,7 @@
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
or xz_type=1
</where>
order by a.create_time desc
</select>

Loading…
Cancel
Save