diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoRespVO.java index 78b268a..188056c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoRespVO.java @@ -43,7 +43,9 @@ public class AttentiontodoRespVO { @Schema(description = "提醒周期(天)") @ExcelProperty("提醒周期(天)") private String remindtime; - + @Schema(description = "提醒天数") + @ExcelProperty("提醒天数") + private String evday; @Schema(description = "提醒人") @ExcelProperty("提醒人") private String remindman; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoSaveReqVO.java index 83268f0..6875a35 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/attentiontodo/vo/AttentiontodoSaveReqVO.java @@ -34,6 +34,9 @@ public class AttentiontodoSaveReqVO { @Schema(description = "提醒周期(天)") private String remindtime; + @Schema(description = "提醒天数") + private String evday; + @Schema(description = "提醒人") private String remindman; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/attentiontodo/AttentiontodoDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/attentiontodo/AttentiontodoDO.java index b2d39a8..2d0f957 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/attentiontodo/AttentiontodoDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/attentiontodo/AttentiontodoDO.java @@ -56,6 +56,10 @@ public class AttentiontodoDO extends BaseDO { * 提醒周期(天) */ private String remindtime; + /** + * 提醒天数 + */ + private String evday; /** * 提醒人 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java index 47fb1bc..6db4ef6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java @@ -187,9 +187,18 @@ public class ProjectOrderServiceImpl implements ProjectOrderService { public void showzbmoney(Long id) { // 校验存在 validateProjectOrderExists(id); + ProjectOrderDO projectOrderDO = projectOrderMapper.selectById(id); // 更新是否收取质保金 LambdaUpdateWrapper eq = new LambdaUpdateWrapper().eq(ProjectOrderDO::getId, id).set(ProjectOrderDO::getShowZbmoney, 1).set(ProjectOrderDO::getDeliveryStatus,4); projectOrderMapper.update(eq); + //更新待办关注表的状态 + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(bdgzsomthingDO::getAttr3,projectOrderDO.getCode()) + .eq(bdgzsomthingDO::getThingname,"订单发货满一年") + .set(bdgzsomthingDO::getAttr4,"1") + .set(bdgzsomthingDO::getAttr12,"0"); + bdgzsomthingMapper.update(wrapper); + } @Override diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/attentiontodo/AttentiontodoForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/attentiontodo/AttentiontodoForm.vue index cd011af..c4ee123 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/attentiontodo/AttentiontodoForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/attentiontodo/AttentiontodoForm.vue @@ -42,6 +42,16 @@ + + + + + + + + + + @@ -116,7 +126,7 @@