From 470d7bb96ecf2e3f6f5d2b350fea17e89938ed26 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 15 Jan 2025 16:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=8F=AF=E5=9C=A8?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=B5=84=E4=BA=A7=E6=89=80=E5=B1=9E=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B9=B6=E5=90=8C=E6=AD=A5=E8=87=B3?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/controller/AssetCurrentController.java | 2 +- .../tc/controller/AssetEmailController.java | 2 +- .../AssetMiniProgramsController.java | 2 +- .../ruoyi/tc/entity/po/AssetCurrentCpPo.java | 2 +- .../entity/response/AssestTaskXqresponse.java | 2 +- .../tc/service/impl/AssetAppServiceImpl.java | 1 + .../tc/service/impl/AssetTaskServiceImpl.java | 146 +++++++++++++----- .../main/resources/mapper/AssetTaskDao.xml | 19 ++- 8 files changed, 124 insertions(+), 52 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java index db82cb8..0939376 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java @@ -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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java index df29ce4..c6855cb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java @@ -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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java index e9e05a3..4b2065b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java @@ -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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java index 7237445..f204300 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java @@ -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("不通过原因") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java index 16fb2a7..e62f298 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java @@ -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 ; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java index 1aa1416..703fb3c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java @@ -163,6 +163,7 @@ public class AssetAppServiceImpl extends ServiceImpl i if (assetAppCpPo!=null){ assetAppCpPo.setAppName(assetApp.getAppName()); assetAppCpPo.setTaskId(assetTask.getId()); + assetAppCpPo.setBfyy(null); //修改 assetAppCpService.updateById(assetAppCpPo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 4a81b07..9ca52e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -187,7 +187,18 @@ public class AssetTaskServiceImpl extends ServiceImpl 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 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 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 businessFormCpPoList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { AssetBusinessForm assetBusinessForm = new AssetBusinessForm(); @@ -986,6 +1042,8 @@ public class AssetTaskServiceImpl extends ServiceImpl networksCpPoList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { AssetBasicNetwork assetBasicNetwork = new AssetBasicNetwork(); BeanUtils.copyProperties(cpPo, assetBasicNetwork); // 复制属性 @@ -1001,6 +1059,8 @@ public class AssetTaskServiceImpl extends ServiceImpl supplyChainList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { AssetSupplyChain assetSupplyChain = new AssetSupplyChain(); BeanUtils.copyProperties(cpPo, assetSupplyChain); // 复制属性 @@ -1015,6 +1075,8 @@ public class AssetTaskServiceImpl extends ServiceImpl unitOtherConcatList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { UnitOtherConcat unitOtherConcat = new UnitOtherConcat(); BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性 diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 18183db..e3d1ede 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -207,6 +207,7 @@ + status = #{req.status}, - update_time=now() + update_time=now(), + btgyy=#{req.btgyy} where asset_id = #{req.assetId} and task_id = #{req.taskId} @@ -990,7 +995,8 @@ status = #{req.status}, - update_time=now() + update_time=now(), + btgyy=#{req.btgyy} where asset_id = #{req.assetId} and task_id = #{req.taskId} @@ -1002,7 +1008,8 @@ status = #{req.status}, - update_time=now() + update_time=now(), + btgyy=#{req.btgyy} where asset_id = #{req.assetId} and task_id = #{req.taskId} @@ -1119,7 +1126,8 @@ status = #{req.status}, - update_time=now() + update_time=now(), + btgyy=#{req.btgyy} where id = #{req.assetId} and task_id = #{req.taskId} @@ -1143,7 +1151,8 @@ status = #{req.status}, - update_time=now() + update_time=now(), + btgyy=#{req.btgyy} where asset_id = #{req.assetId} and task_id = #{req.taskId}