接口bug修改

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/flc/biz/service/impl/AlertFormRecordServiceImpl.java

@@ -101,22 +101,25 @@ public class AlertFormRecordServiceImpl extends BaseService<AlertFormRecordDto,
             }
             LambdaQueryWrapper<AlertFormValue> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(AlertFormValue::getAlertCalledId, alertCalled);
-            // 警情动态表单数据
+            // 更新警情动态表单数据
             List<AlertFormValue> list = iAlertFormValueService.list(queryWrapper);
             HashMap<String, Object> listMap = new HashMap<>();
             list.forEach(x -> listMap.put(x.getFieldCode(), x.getFieldValue()));
             for (Field field : record.getClass().getDeclaredFields()) {
-                field.setAccessible(true); // 设置为可访问，以访问私有属性
+                // 设置为可访问，以访问私有属性
+                field.setAccessible(true);
                 String fieldName = convertToUnderline(field.getName());
                 Object value = field.get(record);
-                if (fieldName.equals("is_light")){
-                    value = ("1".equals(value) ? "是" : "否");
+                //“是否有光照” 转 文字存储
+                if ("is_light".equals(fieldName)){
+                    value = (value.equals(1) ? "是" : "否");
                 }
                 try {
-                    if (listMap.containsKey(fieldName)) {
+                    //表tz_alert_form_value中的字典名称desc和表tz_alert_form_record中列名称description冲突，做特殊处理
+                    if (listMap.containsKey(fieldName) || (listMap.containsKey("desc") && fieldName.equals("description"))) {
                         LambdaUpdateWrapper<AlertFormValue> wrapper = new LambdaUpdateWrapper<>();
                         wrapper.eq(AlertFormValue::getAlertCalledId, alertCalled);
-                        wrapper.eq(AlertFormValue::getFieldCode, fieldName);
+                        wrapper.eq(AlertFormValue::getFieldCode, fieldName.equals("description") ? "desc" : fieldName);
                         wrapper.set(AlertFormValue::getFieldValue, value);
                         iAlertFormValueService.update(wrapper);
                     }