巡查计划-创建提交

王富生
1 parent 69603c7f
Showing 2 changed files with 17 additions and 5 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 import cn.idev.excel.annotation.*;
+import org.apache.ibatis.type.JdbcType;
 @Schema(description = "管理后台 - 巡检计划汇总 Response VO")
 @Data
@@ -86,4 +92,10 @@ public class InspectionPlanRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
+    @Trans(type = TransType.SIMPLE, target = InspectionPlanDO.class, fields = {"creator", "creatorName"}, refs = {"creator", "creatorName"})
+    @TableField(fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
+    private String creator;
+
+    private String creatorName;
+
 }
 \ No newline at end of file
@@ -62,8 +62,8 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         //存在性校验
         validateInspectionPlanExists(createReqVO);
         LocalDateTime now = LocalDateTime.now();
-        String userName = SecurityFrameworkUtils.getLoginUserNickname() + "(" + SecurityFrameworkUtils.getLoginUserId() + ")";
-        Integer rateValue;
+        String userName = SecurityFrameworkUtils.getLoginUserId()+"";
+        int rateValue;
         if (createReqVO.getRateValue().contains("/")) {
             rateValue = Integer.parseInt(createReqVO.getRateValue().split("/")[1]);
         } else {
@@ -95,8 +95,8 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
             inspectionPlan.setRoadId(roadReqVO.getRoadId());
             inspectionPlan.setRoadName(roadReqVO.getRoadName());
             //计划属性label
-            String planAttrLable = DictFrameworkUtils.parseDictDataLabel(PlanConstants.GARDEN_PLAN_ATTR_REDIS_KEY, createReqVO.getPlanAttr());
-            inspectionPlan.setPlanName(roadReqVO.getRoadName() + planAttrLable + createReqVO.getPlanNameSuffix());
+            String planAttrLabel = DictFrameworkUtils.parseDictDataLabel(PlanConstants.GARDEN_PLAN_ATTR_REDIS_KEY, createReqVO.getPlanAttr());
+            inspectionPlan.setPlanName(roadReqVO.getRoadName() + planAttrLabel + createReqVO.getPlanNameSuffix());
             /*1.插入巡查计划*/
             count.addAndGet(inspectionPlanMapper.insert(inspectionPlan));
             /*2.插入角色*/
@@ -171,7 +171,7 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     private void validateInspectionPlanExists(InspectionPlanSaveReqVO req) {
         Set<Long> roadIds = req.getRoadListReqVO().stream().map(InspectionPlanRoadReqVO::getRoadId).collect(Collectors.toSet());
-        QueryWrapper<InspectionPlanDO> sql = new QueryWrapper();
+        QueryWrapper<InspectionPlanDO> sql = new QueryWrapper<>();
         sql.lambda().eq(InspectionPlanDO::getPlanTypeId, req.getPlanTypeId())
                 .in(InspectionPlanDO::getRoadId, roadIds)
                 .between(InspectionPlanDO::getBeginTime, req.getBeginTime(), req.getEndTime());