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

管理端可在资产管理模块编辑资产所属单位信息，并同步至任务中

Browse Source
duhanyu
dongdingding 3 months ago
parent b16a2ff89f
commit f59be5123d
13 changed files with 239 additions and 63 deletions
Show Stats Download Patch File Download Diff File

201
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.tc.controller;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -459,6 +460,7 @@ public class AssetTaskController extends BaseController {
// 设置更新时间
assetCurrent.setUpdateTime(date);
BeanUtils.copyProperties(assetCurrent, assetCurrentHistory);
assetCurrentHistory.setCurrentId(null);
assetCurrentHistoryService.save(assetCurrentHistory);
//新增新监管业务形态历史表
@ -538,6 +540,113 @@ public class AssetTaskController extends BaseController {
@PostMapping("/jyTj")
@Transactional(rollbackFor = Exception.class)
public AjaxResult tj(@RequestBody @Validated AssetCurrentJyPo assetCurrent) {
// //判断是否是驳回后提交
// QueryWrapper<AssetCurrentJyPo> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("current_id", assetCurrent.getCurrentId());
// AssetCurrentJyPo assetCurrentJyPo = assetCurrentJyService.getOne(queryWrapper);
// if (assetCurrentJyPo.getStatus() == 4) {
// // 获取当前时间
// LocalDateTime localDateTime = LocalDateTime.now();
// // 转换为 Date
// Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
// //新增历史记录
// StringBuilder e = new StringBuilder();
// if (CollectionUtil.isNotEmpty(assetCurrent.getGlymList())) {
// assetCurrent.getGlymList().forEach(x -> {
// if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
// e.append(x.getKey());
// e.append(",");
// }
// });
// }
// assetCurrent.setGlym(e.toString());
// StringBuilder f = new StringBuilder();
// if (CollectionUtil.isNotEmpty(assetCurrent.getGlIpList())) {
// assetCurrent.getGlIpList().forEach(x -> {
// if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
// f.append(x.getKey());
// f.append(",");
// }
// });
// }
// assetCurrent.setGlym(e.toString());
//
//
// assetCurrent.setGlIp(f.toString());
// assetCurrent.setStatus(assetCurrent.getStatus());
// AssetCurrentHistory assetCurrentHistory = new AssetCurrentHistory();
// // 设置更新时间
// assetCurrent.setUpdateTime(date);
// BeanUtils.copyProperties(assetCurrent, assetCurrentHistory);
// assetCurrentHistory.setCurrentId(null);
// assetCurrentHistory.setStatus(4);
// assetCurrentHistoryService.save(assetCurrentHistory);
//
// //新增新监管业务形态历史表
// if (assetCurrent.getXjgywxt() != null) {
// assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId());
// assetCurrent.getXjgywxt().setTaskId(assetCurrent.getTaskId());
// AssetBusinessFormHistory assetBusinessFormHistory = new AssetBusinessFormHistory();
// assetBusinessFormHistory.setCopyId(assetCurrent.getCurrentId());
// BeanUtils.copyProperties(assetCurrent.getXjgywxt(), assetBusinessFormHistory);
// assetBusinessFormHistory.setBusinessId(null);
// assetBusinessFormHistoryService.save(assetBusinessFormHistory);
//
// }
// if (!assetCurrent.getGylxxList().isEmpty()) {
// for (AssetSupplyChainJyPo items : assetCurrent.getGylxxList()) {
// items.setAssetId(assetCurrent.getId());
// items.setTaskId(assetCurrent.getTaskId());
//
// }
// //新增供应链历史表
// List<AssetSupplyChainHistory> assetSupplyChainHistoryList = assetCurrent.getGylxxList().stream()
// .map(cpPo -> {
// AssetSupplyChainHistory assetSupplyChainHistory = new AssetSupplyChainHistory();
// assetSupplyChainHistory.setCopyId(assetCurrent.getCurrentId());
// BeanUtils.copyProperties(cpPo, assetSupplyChainHistory); // 复制属性
// assetSupplyChainHistory.setSupplyId(null);
// return assetSupplyChainHistory; // 返回新对象
// })
// .collect(Collectors.toList()); // 收集到列表中
// assetSupplyChainHistoryService.saveBatch(assetSupplyChainHistoryList);
// }
// if (!assetCurrent.getJcwlList().isEmpty()) {
// for (AssetBasicNetworkJyPo items : assetCurrent.getJcwlList()) {
// items.setAssetId(assetCurrent.getId());
// items.setTaskId(assetCurrent.getTaskId());
//
// }
// //新增基础网络历史表
// List<AssetBasicNetworkHistory> assetSupplyChainHistoryList = assetCurrent.getJcwlList().stream()
// .map(cpPo -> {
// AssetBasicNetworkHistory assetBasicNetworkHistory = new AssetBasicNetworkHistory();
// assetBasicNetworkHistory.setCopyId(assetCurrent.getCurrentId());
// BeanUtils.copyProperties(cpPo, assetBasicNetworkHistory); // 复制属性
// assetBasicNetworkHistory.setNetworkId(null);
// return assetBasicNetworkHistory; // 返回新对象
// })
// .collect(Collectors.toList()); // 收集到列表中
// assetBasicNetworkHistoryService.saveBatch(assetSupplyChainHistoryList);
// }
// if (!assetCurrent.getOtherConcat().isEmpty()) {
// for (UnitOtherConcatJyPo items : assetCurrent.getOtherConcat()) {
// items.setAssetId(assetCurrent.getId());
// items.setTaskId(assetCurrent.getTaskId());
// }
// //新增其他联系人
// List<UnitOtherConcatHistory> unitOtherConcatHistoryList = assetCurrent.getOtherConcat().stream()
// .map(cpPo -> {
// UnitOtherConcatHistory unitOtherConcatHistory = new UnitOtherConcatHistory();
// unitOtherConcatHistory.setCopyId(assetCurrent.getCurrentId());
// BeanUtils.copyProperties(cpPo, unitOtherConcatHistory); // 复制属性
// unitOtherConcatHistory.setConcatId(null);
// return unitOtherConcatHistory; // 返回新对象
// })
// .collect(Collectors.toList()); // 收集到列表中
// unitOtherConcatHistoryService.saveBatch(unitOtherConcatHistoryList);
// }
// }
//根据资产id和任务id删除五张表数据
assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
@ -577,7 +686,7 @@ public class AssetTaskController extends BaseController {
}
assetCurrent.setGlIp(b.toString());
assetCurrent.setStatus(1);
Date date=new Date();
Date date = new Date();
assetCurrent.setUpdateTime(date);
//当审核状态为带待核查
if (assetCurrent.getStatus().equals(1)) {
@ -620,7 +729,7 @@ public class AssetTaskController extends BaseController {
// 获取当前时间
LocalDateTime localDateTime = LocalDateTime.now();
// 转换为 Date
date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
//新增历史记录
StringBuilder c = new StringBuilder();
if (CollectionUtil.isNotEmpty(assetCurrent.getGlymList())) {
@ -631,7 +740,7 @@ public class AssetTaskController extends BaseController {
}
});
}
assetCurrent.setGlym(a.toString());
assetCurrent.setGlym(c.toString());
StringBuilder d = new StringBuilder();
if (CollectionUtil.isNotEmpty(assetCurrent.getGlIpList())) {
assetCurrent.getGlIpList().forEach(x -> {
@ -641,13 +750,14 @@ public class AssetTaskController extends BaseController {
}
});
}
assetCurrent.setGlIp(b.toString());
assetCurrent.setGlIp(d.toString());
assetCurrent.setStatus(assetCurrent.getStatus());
AssetCurrentHistory assetCurrentHistory = new AssetCurrentHistory();
// 设置更新时间
assetCurrent.setUpdateTime(date);
BeanUtils.copyProperties(assetCurrent, assetCurrentHistory);
assetCurrentHistory.setCurrentId(null);
assetCurrentHistoryService.save(assetCurrentHistory);
//新增新监管业务形态历史表
@ -714,6 +824,8 @@ public class AssetTaskController extends BaseController {
.collect(Collectors.toList()); // 收集到列表中
unitOtherConcatHistoryService.saveBatch(unitOtherConcatHistoryList);
}
return success();
}
@ -955,6 +1067,20 @@ public class AssetTaskController extends BaseController {
@PostMapping("/xcxjyTj")
@Transactional(rollbackFor = Exception.class)
public AjaxResult xcxJyTj(@RequestBody @Validated AssetMiniProgramsJyPo assetMiniProgramsJyPo) {
// //判断是否是驳回后提交
// QueryWrapper<AssetMiniProgramsJyPo> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("mini_id", assetMiniProgramsJyPo.getMiniId());
// AssetMiniProgramsJyPo assetCurrentJyPo = assetMiniProgramsJyService.getOne(queryWrapper);
// if (assetCurrentJyPo.getStatus()==4){
// //新增历史记录表
// AssetMiniProgramsHistory assetMiniProgramsHistory = new AssetMiniProgramsHistory();
// BeanUtils.copyProperties(assetMiniProgramsJyPo, assetMiniProgramsHistory);
// assetMiniProgramsHistory.setMiniId(null);
// assetMiniProgramsHistory.setStatus(4);
// assetMiniProgramsHistoryService.save(assetMiniProgramsHistory);
// }
assetMiniProgramsCpService.deletByAssetIdandTaskId(assetMiniProgramsJyPo.getAssetId(), assetMiniProgramsJyPo.getTaskId());
//新增流程节点时间
AssetLc assetLc = new AssetLc();
@ -973,11 +1099,14 @@ public class AssetTaskController extends BaseController {
assetLcService.insert(assetLc);
}
assetMiniProgramsJyService.save(assetMiniProgramsJyPo);
//新增历史记录表
AssetMiniProgramsHistory assetMiniProgramsHistory = new AssetMiniProgramsHistory();
BeanUtils.copyProperties(assetMiniProgramsJyPo, assetMiniProgramsHistory);
assetMiniProgramsHistory.setMiniId(null);
assetMiniProgramsHistoryService.save(assetMiniProgramsHistory);
//新增历史记录表
AssetMiniProgramsHistory assetMiniProgramsHistory = new AssetMiniProgramsHistory();
BeanUtils.copyProperties(assetMiniProgramsJyPo, assetMiniProgramsHistory);
assetMiniProgramsHistory.setMiniId(null);
assetMiniProgramsHistoryService.save(assetMiniProgramsHistory);
return success();
}
@ -992,6 +1121,20 @@ public class AssetTaskController extends BaseController {
@PostMapping("/gzhjyTj")
@Transactional(rollbackFor = Exception.class)
public AjaxResult gzhjyTj(@RequestBody @Validated AssetOfficialAccountJyPo assetOfficialAccountJyPo) {
// //判断是否是驳回后提交
// QueryWrapper<AssetOfficialAccountJyPo> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("account_id", assetOfficialAccountJyPo.getAccountId());
// AssetOfficialAccountJyPo assetCurrentJyPo = assetOfficialAccountJyService.getOne(queryWrapper);
// if (assetCurrentJyPo.getStatus()==4){
// //新增历史记录表
// AssetOfficialAccountHistory assetOfficialAccountHistory = new AssetOfficialAccountHistory();
// BeanUtils.copyProperties(assetOfficialAccountJyPo, assetOfficialAccountHistory);
// assetOfficialAccountHistory.setAccountId(null);
// assetOfficialAccountHistory.setStatus(4);
// assetOfficialAccountHistoryService.save(assetOfficialAccountHistory);
//
// }
assetOfficialAccountCpService.deletByAssetIdandTaskId(assetOfficialAccountJyPo.getAssetId(), assetOfficialAccountJyPo.getTaskId());
if (assetOfficialAccountJyPo.getCdList() != null && !assetOfficialAccountJyPo.getCdList().isEmpty()) {
StringBuilder a = new StringBuilder();
@ -1049,6 +1192,20 @@ public class AssetTaskController extends BaseController {
@PostMapping("/appjyTj")
@Transactional(rollbackFor = Exception.class)
public AjaxResult appjyTj(@RequestBody @Validated AssetAppJyPo assetAppJyPo) {
// //判断是否是驳回后提交
// QueryWrapper<AssetAppJyPo> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("app_id", assetAppJyPo.getAppId());
// AssetAppJyPo assetCurrentJyPo = assetAppJyService.getOne(queryWrapper);
// if (assetCurrentJyPo.getStatus()==4){
// //新增历史记录表
// AssetAppHistory assetAppHistory = new AssetAppHistory();
// BeanUtils.copyProperties(assetAppJyPo, assetAppHistory);
// assetAppHistory.setAppId(null);
// assetAppHistory.setStatus(4);
// assetAppHistoryService.save(assetAppHistory);
// }
//根据资产id和任务id删除数据
assetAppCpService.deletByAssetIdandTaskId(assetAppJyPo.getAssetId(), assetAppJyPo.getTaskId());
//新增流程节点时间
@ -1069,10 +1226,13 @@ public class AssetTaskController extends BaseController {
assetAppJyPo.setUpdateTime(date);
assetAppJyService.save(assetAppJyPo);
//新增历史记录表
AssetAppHistory assetAppHistory = new AssetAppHistory();
BeanUtils.copyProperties(assetAppJyPo, assetAppHistory);
assetAppHistory.setAppId(null);
assetAppHistoryService.save(assetAppHistory);
AssetAppHistory assetAppHistory = new AssetAppHistory();
BeanUtils.copyProperties(assetAppJyPo, assetAppHistory);
assetAppHistory.setAppId(null);
assetAppHistoryService.save(assetAppHistory);
return success();
}
@ -1087,6 +1247,21 @@ public class AssetTaskController extends BaseController {
@PostMapping("/emailjyTj")
@Transactional(rollbackFor = Exception.class)
public AjaxResult emailjyTj(@RequestBody @Validated AssetEmailJyPo assetEmailJyPo) {
// //判断是否是驳回后提交
// QueryWrapper<AssetEmailJyPo> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("email_id", assetEmailJyPo.getEmailId());
// AssetEmailJyPo assetCurrentJyPo = assetEmailJyService.getOne(queryWrapper);
// if (assetCurrentJyPo.getStatus()==4){
// //新增历史记录表
// AssetEmailHistory assetEmailHistory = new AssetEmailHistory();
// BeanUtils.copyProperties(assetEmailJyPo, assetEmailHistory);
// assetEmailHistory.setEmailId(null);
// assetEmailHistory.setStatus(4);
// assetEmailHistoryService.save(assetEmailHistory);
// }
//根据资产id和任务id删除数据
assetEmailCpService.deletByAssetIdandTaskId(assetEmailJyPo.getAssetId(), assetEmailJyPo.getTaskId());
//新增流程节点时间

7
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
Unescape View File

@ -1,9 +1,6 @@
package com.ruoyi.tc.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.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import com.ruoyi.tc.entity.request.Acomma;
@ -1050,7 +1047,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
@ApiModelProperty("报废原因")
private String bfyy;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java
Unescape View File

@ -1,8 +1,6 @@
package com.ruoyi.tc.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -139,10 +137,12 @@ public class AssetAppCpPo extends BaseClass implements Serializable {
*/
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("报废原因")
private String bfyy;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java
Unescape View File

@ -1,9 +1,6 @@
package com.ruoyi.tc.entity.po;
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.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import com.ruoyi.tc.entity.request.Acomma;
@ -1003,13 +1000,14 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
@ApiModelProperty("是否报废（默认0不报废 2代表报废）")
private String isbf;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("报废原因")
private String bfyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailCpPo.java
Unescape View File

@ -1,8 +1,6 @@
package com.ruoyi.tc.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -148,10 +146,12 @@ public class AssetEmailCpPo extends BaseClass implements Serializable {
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("报废原因")
private String bfyy;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsCpPo.java
Unescape View File

@ -1,8 +1,6 @@
package com.ruoyi.tc.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -200,7 +198,7 @@ public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("报废原因")
private String bfyy;
@ -208,7 +206,7 @@ public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
@ApiModelProperty("不通过次数")
private Integer count;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;

7
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountCpPo.java
Unescape View File

@ -1,9 +1,6 @@
package com.ruoyi.tc.entity.po;
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.baomidou.mybatisplus.annotation.*;
import com.ruoyi.tc.baseClass.BaseClass;
import com.ruoyi.tc.entity.request.AssetOfficialAccountMenu;
import io.swagger.annotations.ApiModel;
@ -191,7 +188,7 @@ public class AssetOfficialAccountCpPo extends BaseClass implements Serializable
@ApiModelProperty("不通过次数")
private Integer count;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;

2
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java
Unescape View File

@ -43,7 +43,7 @@ public interface AssetAppCpMapper extends BaseMapper<AssetAppCpPo> {
* @Param taskId 任务id
*/
@Select("select * from asset_app_cp where asset_id=#{assetId} and task_id =#{taskId}")
AssetAppCpPo findByTaskId(int assetId, int taskId);
AssetAppCpPo findByTaskId(@Param("assetId") int assetId,@Param("taskId") int taskId);
/**
* 修改不通过原因

2
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java
Unescape View File

@ -44,7 +44,7 @@ public interface AssetEmailCpMapper extends BaseMapper<AssetEmailCpPo> {
* @return
*/
@Select("select * from asset_email_cp where asset_id=#{assetId} and task_id =#{taskId}")
AssetEmailCpPo findByTaskId(int assetId,int taskId);
AssetEmailCpPo findByTaskId(@Param("assetId") int assetId,@Param("taskId")int taskId);
/**
* 修改不通过原因
*

3
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/history/AssetAppHistoryMapper.java
Unescape View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.history.AssetAppHistory;
import com.ruoyi.tc.entity.request.AssetzcTjRequest;
import com.ruoyi.tc.entity.response.AssetzcTjResponse;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@ -24,7 +25,7 @@ public interface AssetAppHistoryMapper extends BaseMapper<AssetAppHistory> {
* @return
*/
@Select("select app_name as xtmc,update_time as updateTime,status, app_id as id from asset_app_history where task_id= #{req.taskId} and asset_id =#{req.assetId} and status!=0")
List<AssetzcTjResponse> findByTaskIdandAssetId(AssetzcTjRequest req);
List<AssetzcTjResponse> findByTaskIdandAssetId(@Param("req") AssetzcTjRequest req);
}

5
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java
Unescape View File

@ -164,9 +164,8 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
assetTask.setStatus(0);
assetTask.setBfyy(null);
assetTask.setBtgyy(null);
LocalDateTime localDateTime = LocalDateTime.now();
Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant());
assetTask.setUpdateTime(date);
assetTask.setUpdateTime(null);
s.setTaskStatus(1);
assetTask.setAppId(assetTask.getAppId());
assetAppCpService.updateById(assetTask);

23
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java
Unescape View File

@ -189,7 +189,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
List<AssetCurrentCpPo> list = assetTaskDao.findByDwmcAssetCurrent(part);
list.forEach(assetCurrentResponse -> {
assetCurrentResponse.setTaskId(id);
if (assetCurrentResponse.getXtzt().equals("5")) {
if (assetCurrentResponse.getXtzt()!=null && assetCurrentResponse.getXtzt().equals("5")) {
assetCurrentResponse.setStatus(5);
assetCurrentResponse.setBfyy(null);
assetCurrentResponse.setBtgyy(null);
@ -231,7 +231,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
assetMiniProgramsCpPo.setAssetId(cpPo.getId());
BeanUtils.copyProperties(cpPo, assetMiniProgramsCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getState().equals("7")) {
if (cpPo.getState()!=null && cpPo.getState().equals("7")) {
assetMiniProgramsCpPo.setStatus(5);
assetMiniProgramsCpPo.setBfyy(null);
assetMiniProgramsCpPo.setBtgyy(null);
@ -262,7 +262,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
assetOfficialAccountCpPo.setAssetId(cpPo.getId());
BeanUtils.copyProperties(cpPo, assetOfficialAccountCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getGzhzt().equals("7")) {
if (cpPo.getGzhzt()!=null && cpPo.getGzhzt().equals("7")) {
assetOfficialAccountCpPo.setStatus(5);
assetOfficialAccountCpPo.setBfyy(null);
assetOfficialAccountCpPo.setBtgyy(null);
@ -294,7 +294,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
emailCpPo.setAssetId(cpPo.getId());
BeanUtils.copyProperties(cpPo, emailCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getYjxtzc().equals("2")) {
if (cpPo.getYjxtzc()!=null && cpPo.getYjxtzc().equals("2")) {
emailCpPo.setStatus(5);
emailCpPo.setBfyy(null);
emailCpPo.setBtgyy(null);
@ -325,7 +325,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
BeanUtils.copyProperties(cpPo, appCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getAppState().equals("7")) {
if (cpPo.getAppState()!=null && cpPo.getAppState().equals("7")) {
appCpPo.setStatus(5);
appCpPo.setBfyy(null);
appCpPo.setBtgyy(null);
@ -623,7 +623,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
if (req.getBtgyy() != null) {
assetTaskDao.emailsh(req);
// //修改子表和历史表新增
// updateEmailZiandHistory(req, date);
updateEmailZiandHistory(req, date);
} else {
//修改子表和历史表新增
updateEmailZiandHistory(req, date);
@ -670,13 +670,14 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
// 比较两个日期
if (ifcqDate.before(taskDeadlineDate)) {
//超期完成
finalTask.setTaskStatus(3);
finalTask.setTaskStatus(2);
finishTime = LocalDateTime.now();
finalTask.setTaskFinishTime(finishTime);
assetTaskService.update(finalTask);
} else if (ifcqDate.after(taskDeadlineDate)) {
//正常完成
finalTask.setTaskStatus(2);
finalTask.setTaskStatus(3);
finishTime = LocalDateTime.now();
finalTask.setTaskFinishTime(finishTime);
assetTaskService.update(finalTask);
@ -689,6 +690,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
private void updateAppZiandHistory(AssetCurrentShRequest req, Date date) {
req.getAssetAppCpPo().setStatus(req.getStatus());
req.getAssetAppCpPo().setUpdateTime(date);
req.getAssetAppCpPo().setBtgyy(req.getBtgyy());
assetAppCpService.updateById(req.getAssetAppCpPo());
//新增历史记录表
// AssetAppHistory assetAppHistory = new AssetAppHistory();
@ -700,6 +702,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
private void updateEmailZiandHistory(AssetCurrentShRequest req, Date date) {
req.getAssetEmailCpPo().setStatus(req.getStatus());
req.getAssetEmailCpPo().setUpdateTime(date);
req.getAssetEmailCpPo().setBtgyy(req.getBtgyy());
assetEmailCpService.updateById(req.getAssetEmailCpPo());
// //新增历史记录表
// AssetEmailHistory assetEmailHistory = new AssetEmailHistory();
@ -724,6 +727,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
}
req.getAssetOfficialAccountCpPo().setStatus(req.getStatus());
req.getAssetOfficialAccountCpPo().setUpdateTime(date);
req.getAssetOfficialAccountCpPo().setBtgyy(req.getBtgyy());
assetOfficialAccountCpService.updateById(req.getAssetOfficialAccountCpPo());
// //新增历史记录表
// AssetOfficialAccountHistory assetOfficialAccountHistory = new AssetOfficialAccountHistory();
@ -735,6 +739,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
private void updateMinZiandHistory(AssetCurrentShRequest req, Date date) {
req.getAssetMiniProgramsCpPo().setStatus(req.getStatus());
req.getAssetMiniProgramsCpPo().setUpdateTime(date);
req.getAssetMiniProgramsCpPo().setBtgyy(req.getBtgyy());
assetMiniProgramsCpService.updateById(req.getAssetMiniProgramsCpPo());
// //新增历史记录表
// AssetMiniProgramsHistory assetMiniProgramsHistory = new AssetMiniProgramsHistory();
@ -774,6 +779,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
// 设置更新时间
req.getAssetCurrentCpPo().setUpdateTime(date);
req.getAssetCurrentCpPo().setStatus(req.getStatus());
req.getAssetCurrentCpPo().setBtgyy(req.getBtgyy());
assetCurrentCpService.save(req.getAssetCurrentCpPo());
//新增新监管业务形态
if (req.getAssetCurrentCpPo().getXjgywxt() != null) {

20
ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml
Unescape View File

@ -249,13 +249,12 @@
</select>
<select id="dwHc" resultType="com.ruoyi.tc.entity.response.AssetdwHcResponse">
select
h.dwmc,h.task_id,h.latest_create_time,h.task_deadline,h.total,h.checked,h.notChecked,h.dsp,h.shthcs,h.taskStatus,h.checkedRatio
h.dwmc,h.task_id,h.total,h.checked,h.notChecked,h.dsp,h.shthcs,h.taskStatus,h.checkedRatio
from(
SELECT
s.dwmc,
s.task_id,
s.latest_create_time, -- 使用当前时间
b.task_deadline,
SUM(s.total) AS total,
SUM(s.checked) AS checked,
SUM( s.notChecked ) AS notChecked,
@ -984,7 +983,8 @@
status = #{req.status},
</if>
update_time=now(),
btgyy=#{req.btgyy}
btgyy=#{req.btgyy},
count = COALESCE(count, 0) + 1
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}
</update>
@ -997,7 +997,8 @@
status = #{req.status},
</if>
update_time=now(),
btgyy=#{req.btgyy}
btgyy=#{req.btgyy},
count = COALESCE(count, 0) + 1
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}
</update>
@ -1010,7 +1011,8 @@
status = #{req.status},
</if>
update_time=now(),
btgyy=#{req.btgyy}
btgyy=#{req.btgyy},
count = COALESCE(count, 0) + 1
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}
@ -1128,7 +1130,8 @@
status = #{req.status},
</if>
update_time=now(),
btgyy=#{req.btgyy}
count = COALESCE(count, 0) + 1
</set>
where id = #{req.assetId} and task_id = #{req.taskId}
</update>
@ -1153,7 +1156,8 @@
status = #{req.status},
</if>
update_time=now(),
btgyy=#{req.btgyy}
btgyy=#{req.btgyy},
count = COALESCE(count, 0) + 1
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}

Write Preview
Loading…
Cancel
Save