fix(jg)：厂车的车牌号展示

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -53,7 +53,7 @@ public class JgUseRegistrationController extends BaseController {
                 String.valueOf(map.get("instanceId")),
                 String.valueOf(map.get("operate")),
                 String.valueOf(map.get("comment")),
-                String.valueOf(map.get("licensePlateNum")));
+                String.valueOf(map.get("carNumber")));
         return ResponseHelper.buildResponse("ok");
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.module.jg.api.enums.ConstructionEnum;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
-import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -428,7 +428,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return this.baseMapper.getDetailById(jgUseRegistration.getSequenceNbr());
     }
 
-    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst,String licensePlateNum) {
+    public JgUseRegistration updateData(Long sequenceNbr, String operate, WorkflowResultDto workflowResultDto, Boolean isFirst,String carNumber) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         String role = workflowResultDto.getNextExecutorRoleIds();
         String taskCode = FlowStatusEnum.TO_BE_FINISHED.getName();
@@ -436,7 +436,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             taskCode = workflowResultDto.getNextTaskCode();
         }
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);
-        jgUseRegistration.setLicensePlateNum(licensePlateNum);
         LambdaQueryWrapper<JgUseRegistrationEq> eq = new QueryWrapper<JgUseRegistrationEq>().lambda().eq(JgUseRegistrationEq::getEquipTransferId, sequenceNbr);
         JgUseRegistrationEq jgUseRegistrationEq = jgRelationEquipMapper.selectOne(eq);
         jgUseRegistration.setEquipId(jgUseRegistrationEq.getEquId());
@@ -446,6 +445,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setInstanceStatus(workflowResultDto.getExecutorRoleIds());
             jgUseRegistration.setInstanceId(workflowResultDto.getInstanceId());
         }
+        if (!ObjectUtils.isEmpty(carNumber)){
+            //更新安全追溯-场内车辆中的“车牌号字段”
+            LambdaUpdateWrapper<IdxBizJgRegisterInfo> wrapper = new UpdateWrapper<IdxBizJgRegisterInfo>().lambda()
+                    .eq(IdxBizJgRegisterInfo::getRecord, jgUseRegistrationEq.getEquId());
+            IdxBizJgRegisterInfo idxBizJgRegisterInfo = new IdxBizJgRegisterInfo();
+            idxBizJgRegisterInfo.setCarNumber(carNumber);
+            idxBizJgRegisterInfoMapper.update(idxBizJgRegisterInfo,wrapper);
+        }
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
             jgUseRegistration.setNextExecuteIds(role);
             jgUseRegistration.setPromoter(reginParams.getUserModel().getUserId());
@@ -612,7 +619,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
 
-    public void flowExecute(Long id, String instanceId, String operate, String comment,String licensePlateNum) {
+    public void flowExecute(Long id, String instanceId, String operate, String comment,String carNumber) {
         JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(id);
         // 组装信息
         TaskResultDTO dto = new TaskResultDTO();
@@ -638,7 +645,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         List<WorkflowResultDto> resultDto = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
         if (!ObjectUtils.isEmpty(resultDto) && !ObjectUtils.isEmpty(resultDto.get(0))) {
             WorkflowResultDto workflowResultDto = resultDto.get(0);
-            updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE,licensePlateNum);
+            updateData(jgUseRegistration.getSequenceNbr(), operate, workflowResultDto, Boolean.FALSE,carNumber);
         }
     }
 
@@ -713,7 +720,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.remove("submit");
             jsonObject.remove("instanceId");
             // 补充"车牌号"字段
-            jsonObject.put("licensePlateNum", jgUseRegistration.getLicensePlateNum());
+            LambdaQueryWrapper<IdxBizJgRegisterInfo> wrapper = new QueryWrapper<IdxBizJgRegisterInfo>().lambda().eq(IdxBizJgRegisterInfo::getRecord, record);
+            IdxBizJgRegisterInfo idxBizJgRegisterInfo = idxBizJgRegisterInfoMapper.selectOne(wrapper);
+            jsonObject.put("carNumber",idxBizJgRegisterInfo.getCarNumber());
             return jsonObject;
         }
         // 基本信息 + 制造信息

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgTechParamsVehicleDto.java

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
  * 安全追溯-场内车辆
@@ -16,10 +15,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="IdxBizJgTechParamsVehicleDto", description="安全追溯-场内车辆")
-public class IdxBizJgTechParamsVehicleDto  extends BaseDto {
+@ApiModel(value = "IdxBizJgTechParamsVehicleDto", description = "安全追溯-场内车辆")
+public class IdxBizJgTechParamsVehicleDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgTechParamsVehicle.java

@@ -2,14 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.checkerframework.checker.units.qual.A;
-
-import java.util.Date;
 
 /**
  * 安全追溯-场内车辆