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

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

Browse Source
duhanyu
dongdingding 1 month ago
parent cf029a573f
commit 470d7bb96e
8 changed files with 124 additions and 52 deletions
Show Stats Download Patch File Download Diff File

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

@ -529,7 +529,7 @@ public class AssetCurrentController extends BaseController {
if (s.getStatus()==5 ){
//修改任务中资产状态
s.setStatus(0);
s.setBtgyy(null);
s.setBfyy(null);
assetTask.setTaskStatus(1);
assetTaskService.update(assetTask);
assetCurrentCpService.updateById(s);

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

@ -233,7 +233,7 @@ public class AssetEmailController extends BaseController {
if (assetEmailCpPo.getStatus()==5 ) {
//修改任务中资产状态
assetEmailCpPo.setStatus(0);
assetEmailCpPo.setBtgyy(null);
assetEmailCpPo.setBfyy(null);
assetTask.setTaskStatus(1);
assetTaskService.update(assetTask);
assetEmailCpService.updateById(assetEmailCpPo);

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

@ -241,7 +241,7 @@ public class AssetMiniProgramsController extends BaseController {
if (assetMiniProgramsCpPo.getStatus()==5) {
//修改任务中资产状态
assetMiniProgramsCpPo.setStatus(0);
assetMiniProgramsCpPo.setBtgyy(null);
assetMiniProgramsCpPo.setBfyy(null);
assetTask.setTaskStatus(1);
assetMiniProgramsCpService.updateById(assetMiniProgramsCpPo);
assetTaskService.update(assetTask);

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

@ -1007,7 +1007,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
private String bfyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status = 0;
private Integer status;
@ApiModelProperty("不通过原因")

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

@ -66,5 +66,5 @@ public class AssestTaskXqresponse {
@ApiModelProperty("单位核查时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
private LocalDateTime updateTime ;
}

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

@ -163,6 +163,7 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
if (assetAppCpPo!=null){
assetAppCpPo.setAppName(assetApp.getAppName());
assetAppCpPo.setTaskId(assetTask.getId());
assetAppCpPo.setBfyy(null);
//修改
assetAppCpService.updateById(assetAppCpPo);
}

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

@ -187,7 +187,18 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
for (String part : parts) {
//根据单位名称查询资产
List<AssetCurrentCpPo> list = assetTaskDao.findByDwmcAssetCurrent(part);
list.forEach(assetCurrentResponse -> assetCurrentResponse.setTaskId(id));
list.forEach(assetCurrentResponse -> {
assetCurrentResponse.setTaskId(id);
if (assetCurrentResponse.getXtzt().equals("5")) {
assetCurrentResponse.setStatus(5);
assetCurrentResponse.setBfyy(null);
assetCurrentResponse.setBtgyy(null);
} else {
assetCurrentResponse.setStatus(0);
assetCurrentResponse.setBfyy(null);
assetCurrentResponse.setBtgyy(null);
}
});
assetCurrentCpService.saveBatch(list);
//新增新监管业务形态
@ -215,9 +226,19 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
List<AssetMiniProgramsCpPo> miniProgramsNewList = list.stream().map(cpPo -> {
AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
assetMiniProgramsCpPo.setTaskId(id);
assetMiniProgramsCpPo.setStatus(0);
assetMiniProgramsCpPo.setAssetId(cpPo.getId());
BeanUtils.copyProperties(cpPo, assetMiniProgramsCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getState().equals("7")) {
assetMiniProgramsCpPo.setStatus(5);
assetMiniProgramsCpPo.setBfyy(null);
assetMiniProgramsCpPo.setBtgyy(null);
} else {
assetMiniProgramsCpPo.setStatus(0);
assetMiniProgramsCpPo.setBfyy(null);
assetMiniProgramsCpPo.setBtgyy(null);
}
return assetMiniProgramsCpPo; // 返回新对象
}).collect(Collectors.toList()); // 收集到列表中
assetMiniProgramsCpService.saveBatch(miniProgramsNewList);
@ -234,9 +255,19 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
List<AssetOfficialAccountCpPo> officialAccountProgramsNewList = list.stream().map(cpPo -> {
AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo();
assetOfficialAccountCpPo.setTaskId(id);
assetOfficialAccountCpPo.setStatus(0);
assetOfficialAccountCpPo.setAssetId(cpPo.getId());
BeanUtils.copyProperties(cpPo, assetOfficialAccountCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getGzhzt().equals("7")) {
assetOfficialAccountCpPo.setStatus(5);
assetOfficialAccountCpPo.setBfyy(null);
assetOfficialAccountCpPo.setBtgyy(null);
} else {
assetOfficialAccountCpPo.setStatus(0);
assetOfficialAccountCpPo.setBfyy(null);
assetOfficialAccountCpPo.setBtgyy(null);
}
return assetOfficialAccountCpPo; // 返回新对象
}).collect(Collectors.toList()); // 收集到列表中
assetOfficialAccountCpService.saveBatch(officialAccountProgramsNewList);
@ -255,8 +286,17 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
AssetEmailCpPo emailCpPo = new AssetEmailCpPo();
emailCpPo.setTaskId(id);
emailCpPo.setAssetId(cpPo.getId());
emailCpPo.setStatus(0);
BeanUtils.copyProperties(cpPo, emailCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getYjxtzc().equals("2")) {
emailCpPo.setStatus(5);
emailCpPo.setBfyy(null);
emailCpPo.setBtgyy(null);
} else {
emailCpPo.setStatus(0);
emailCpPo.setBfyy(null);
emailCpPo.setBtgyy(null);
}
return emailCpPo; // 返回新对象
}).collect(Collectors.toList()); // 收集到列表中
assetEmailCpService.saveBatch(emailCpNewList);
@ -274,8 +314,18 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
AssetAppCpPo appCpPo = new AssetAppCpPo();
appCpPo.setTaskId(id);
appCpPo.setAssetId(cpPo.getId());
appCpPo.setStatus(0);
BeanUtils.copyProperties(cpPo, appCpPo); // 复制属性
// 根据 xtzt 设置 status
if (cpPo.getAppState().equals("7")) {
appCpPo.setStatus(5);
appCpPo.setBfyy(null);
appCpPo.setBtgyy(null);
} else {
appCpPo.setStatus(0);
appCpPo.setBfyy(null);
appCpPo.setBtgyy(null);
}
return appCpPo; // 返回新对象
}).collect(Collectors.toList()); // 收集到列表中
assetAppCpService.saveBatch(appCpNewList);
@ -504,57 +554,60 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
if (req.getType() == 0) {
//web资产
//是否超期
ifCq(req, assetTask);
// ifCq(req, assetTask);
//创建任务流程
getTaskStatus(req);
if (req.getBtgyy() != null) {
assetTaskDao.sh(req);
// //修改子表和新增历史表
// updateZiandHistory(req, date);
} else {
//修改子表和新增历史表
updateZiandHistory(req, date);
//同步主表
taskSaveOrDelete(req);
} else {
//修改子表和新增历史表
updateZiandHistory(req, date);
}
} else if (req.getType() == 1) {
//小程序资产
//创建任务流程
ifCq(req, assetTask);
// ifCq(req, assetTask);
// //创建任务流程
getTaskStatus(req);
if (req.getBtgyy() != null) {
assetTaskDao.xcxsh(req);
// //修改子表和新增历史表
// updateMinZiandHistory(req, date);
} else {
//修改子表和新增历史表
updateMinZiandHistory(req, date);
//同步主表
syb(req);
} else {
//修改子表和新增历史表
updateMinZiandHistory(req, date);
}
} else if (req.getType() == 2) {
//公众号资产
//创建任务流程
ifCq(req, assetTask);
// ifCq(req, assetTask);
//创建任务流程
getTaskStatus(req);
if (req.getBtgyy() != null) {
assetTaskDao.gzhsh(req);
// //修改子表和历史表新增
// updateGzhZiandHistory(req, date);
} else {
//修改子表和历史表新增
updateGzhZiandHistory(req, date);
//同步主表
syb(req);
} else {
//修改子表和历史表新增
updateGzhZiandHistory(req, date);
}
} else if (req.getType() == 3) {
//电子邮件
//创建任务流程
ifCq(req, assetTask);
// ifCq(req, assetTask);
//创建任务流程
getTaskStatus(req);
if (req.getBtgyy() != null) {
@ -571,18 +624,19 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
} else if (req.getType() == 4) {
//app
//创建任务流程
ifCq(req, assetTask);
// ifCq(req, assetTask);
//创建任务流程
getTaskStatus(req);
if (req.getBtgyy() != null) {
assetTaskDao.appsh(req);
// //修改子表和历史表新增
// updateAppZiandHistory(req, date);
} else {
//修改子表和历史表新增
updateAppZiandHistory(req, date);
//同步主表
syb(req);
} else {
//修改子表和历史表新增
updateAppZiandHistory(req, date);
}
}
@ -627,21 +681,21 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
req.getAssetAppCpPo().setUpdateTime(date);
assetAppCpService.updateById(req.getAssetAppCpPo());
//新增历史记录表
AssetAppHistory assetAppHistory = new AssetAppHistory();
BeanUtils.copyProperties(req.getAssetAppCpPo(), assetAppHistory);
assetAppHistory.setAppId(null);
assetAppHistoryService.save(assetAppHistory);
// AssetAppHistory assetAppHistory = new AssetAppHistory();
// BeanUtils.copyProperties(req.getAssetAppCpPo(), assetAppHistory);
// assetAppHistory.setAppId(null);
// assetAppHistoryService.save(assetAppHistory);
}
private void updateEmailZiandHistory(AssetCurrentShRequest req, Date date) {
req.getAssetEmailCpPo().setStatus(req.getStatus());
req.getAssetEmailCpPo().setUpdateTime(date);
assetEmailCpService.updateById(req.getAssetEmailCpPo());
//新增历史记录表
AssetEmailHistory assetEmailHistory = new AssetEmailHistory();
BeanUtils.copyProperties(req.getAssetEmailCpPo(), assetEmailHistory);
assetEmailHistory.setEmailId(null);
assetEmailHistoryService.save(assetEmailHistory);
// //新增历史记录表
// AssetEmailHistory assetEmailHistory = new AssetEmailHistory();
// BeanUtils.copyProperties(req.getAssetEmailCpPo(), assetEmailHistory);
// assetEmailHistory.setEmailId(null);
// assetEmailHistoryService.save(assetEmailHistory);
}
private void updateGzhZiandHistory(AssetCurrentShRequest req, Date date) {
@ -661,22 +715,22 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
req.getAssetOfficialAccountCpPo().setStatus(req.getStatus());
req.getAssetOfficialAccountCpPo().setUpdateTime(date);
assetOfficialAccountCpService.updateById(req.getAssetOfficialAccountCpPo());
//新增历史记录表
AssetOfficialAccountHistory assetOfficialAccountHistory = new AssetOfficialAccountHistory();
BeanUtils.copyProperties(req.getAssetOfficialAccountCpPo(), assetOfficialAccountHistory);
assetOfficialAccountHistory.setAccountId(null);
assetOfficialAccountHistoryService.save(assetOfficialAccountHistory);
// //新增历史记录表
// AssetOfficialAccountHistory assetOfficialAccountHistory = new AssetOfficialAccountHistory();
// BeanUtils.copyProperties(req.getAssetOfficialAccountCpPo(), assetOfficialAccountHistory);
// assetOfficialAccountHistory.setAccountId(null);
// assetOfficialAccountHistoryService.save(assetOfficialAccountHistory);
}
private void updateMinZiandHistory(AssetCurrentShRequest req, Date date) {
req.getAssetMiniProgramsCpPo().setStatus(req.getStatus());
req.getAssetMiniProgramsCpPo().setUpdateTime(date);
assetMiniProgramsCpService.updateById(req.getAssetMiniProgramsCpPo());
//新增历史记录表
AssetMiniProgramsHistory assetMiniProgramsHistory = new AssetMiniProgramsHistory();
BeanUtils.copyProperties(req.getAssetMiniProgramsCpPo(), assetMiniProgramsHistory);
assetMiniProgramsHistory.setMiniId(null);
assetMiniProgramsHistoryService.save(assetMiniProgramsHistory);
// //新增历史记录表
// AssetMiniProgramsHistory assetMiniProgramsHistory = new AssetMiniProgramsHistory();
// BeanUtils.copyProperties(req.getAssetMiniProgramsCpPo(), assetMiniProgramsHistory);
// assetMiniProgramsHistory.setMiniId(null);
// assetMiniProgramsHistoryService.save(assetMiniProgramsHistory);
}
private void updateZiandHistory(AssetCurrentShRequest req, Date date) {
@ -745,7 +799,7 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
unitOtherConcatCpService.saveBatch(req.getAssetCurrentCpPo().getOtherConcat());
}
//新增历史记录
saveHistory(req, a, b, date, assetCurrentHistory);
// saveHistory(req, a, b, date, assetCurrentHistory);
}
private void saveHistory(AssetCurrentShRequest req, StringBuilder a, StringBuilder b, Date date, AssetCurrentHistory assetCurrentHistory) {
@ -969,6 +1023,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
//删除原有数据
if (CollectionUtil.isNotEmpty(businessList)) {
assetBusinessFormService.deleteIdList(businessList);
}else{
//将子表数据复制到主表中
List<AssetBusinessForm> businessFormCpPoList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> {
AssetBusinessForm assetBusinessForm = new AssetBusinessForm();
@ -986,6 +1042,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
if (CollectionUtil.isNotEmpty(netWorkList)) {
assetBasicNetworkService.deleteIdList(netWorkList);
}else{
List<AssetBasicNetwork> networksCpPoList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> {
AssetBasicNetwork assetBasicNetwork = new AssetBasicNetwork();
BeanUtils.copyProperties(cpPo, assetBasicNetwork); // 复制属性
@ -1001,6 +1059,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
//删除原有数据
if (CollectionUtil.isNotEmpty(supplyList)) {
assetSupplyChainService.deleteIdList(supplyList);
}else{
List<AssetSupplyChain> supplyChainList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> {
AssetSupplyChain assetSupplyChain = new AssetSupplyChain();
BeanUtils.copyProperties(cpPo, assetSupplyChain); // 复制属性
@ -1015,6 +1075,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
//删除原有数据
if (CollectionUtil.isNotEmpty(unitList)) {
unitOtherConcatService.deleteIdList(unitList);
}else{
List<UnitOtherConcat> unitOtherConcatList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> {
UnitOtherConcat unitOtherConcat = new UnitOtherConcat();
BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性

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

@ -207,6 +207,7 @@
</where>
</select>
<select id="zcHc" resultType="com.ruoyi.tc.entity.response.AssestTaskXqresponse">
select b.xtlx,
b.xtmc,
b.dwmc as zcdwmc,
@ -969,6 +970,9 @@
LIMIT 1), '1970-01-01 00:00:00')
) AS latest_update_time;
</select>
<select id="findBytaskId" resultType="com.ruoyi.tc.entity.AssetTask" parameterType="java.lang.Integer">
select * from asset_task where id=#{taskId}
</select>
<update id="xcxsh"
@ -978,7 +982,8 @@
<if test="req.status != null ">
status = #{req.status},
</if>
update_time=now()
update_time=now(),
btgyy=#{req.btgyy}
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}
</update>
@ -990,7 +995,8 @@
<if test="req.status != null ">
status = #{req.status},
</if>
update_time=now()
update_time=now(),
btgyy=#{req.btgyy}
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}
</update>
@ -1002,7 +1008,8 @@
<if test="req.status != null ">
status = #{req.status},
</if>
update_time=now()
update_time=now(),
btgyy=#{req.btgyy}
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}
@ -1119,7 +1126,8 @@
<if test="req.status != null ">
status = #{req.status},
</if>
update_time=now()
update_time=now(),
btgyy=#{req.btgyy}
</set>
where id = #{req.assetId} and task_id = #{req.taskId}
</update>
@ -1143,7 +1151,8 @@
<if test="req.status != null ">
status = #{req.status},
</if>
update_time=now()
update_time=now(),
btgyy=#{req.btgyy}
</set>
where asset_id = #{req.assetId} and task_id = #{req.taskId}

Write Preview
Loading…
Cancel
Save