1.使用登记单据变更功能

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

@@ -28,7 +28,7 @@ public class BizDataChangeController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/{bizType}/save")
     @ApiOperation(value = "业务数据变更保存", httpMethod = "POST")
-    public ResponseModel<String> save(String applyNo,
+    public ResponseModel<String> save(@RequestParam String applyNo,
                                       @PathVariable String bizType,
                                       @RequestBody RequestChangeData changeData) {
         bizDataChangeService.save(applyNo, bizType, changeData);

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/EquipChangeDataUpdateService.java

@@ -61,15 +61,15 @@ public class EquipChangeDataUpdateService {
         updateWrapper.eq(IdxBizJgDesignInfo::getRecord, record);
         updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDate, DateUtil.parse(equipDesignChangeDataDto.getDesignDate(), "yyyy-MM-dd"));
         updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignDoc(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignDoc());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitCreditCode(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignUnitCreditCode());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitName(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignUnitName());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUseDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignUseDate());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignLicenseNum(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignLicenseNum());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalUnit(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getAppraisalUnit());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getOtherAccessoriesDes(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getOtherAccessoriesDes());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getAppraisalDate());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDrawingDo(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDrawingDo());
-        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignStandard(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignDoc, equipDesignChangeDataDto.getDesignStandard());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitCreditCode(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignUnitCreditCode, equipDesignChangeDataDto.getDesignUnitCreditCode());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUnitName(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignUnitName, equipDesignChangeDataDto.getDesignUnitName());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignUseDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignUseDate, equipDesignChangeDataDto.getDesignUseDate());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignLicenseNum(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignLicenseNum, equipDesignChangeDataDto.getDesignLicenseNum());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalUnit(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getAppraisalUnit, equipDesignChangeDataDto.getAppraisalUnit());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getOtherAccessoriesDes(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getOtherAccessoriesDes, equipDesignChangeDataDto.getOtherAccessoriesDes());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getAppraisalDate(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getAppraisalDate, equipDesignChangeDataDto.getAppraisalDate());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDrawingDo(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDrawingDo, equipDesignChangeDataDto.getDrawingDo());
+        updateWrapper.set(!Objects.equals(equipDesignChangeDataDto.getDesignStandard(), IBizDataChangeHandleStrategy.DEFAULT_VALUE), IdxBizJgDesignInfo::getDesignStandard, equipDesignChangeDataDto.getDesignStandard());
         idxBizJgDesignInfoMapper.update(null, updateWrapper);
     }
 
@@ -125,7 +125,7 @@ public class EquipChangeDataUpdateService {
     public void updateTechParamByRecord(String tableName, String record, List<ChangeDataDto> changeDataDtos) {
         List<DynamicColumnDto> columns = changeDataDtos.stream().map(c->{
             DynamicColumnDto  columnDto = new DynamicColumnDto();
-            columnDto.setColumnName(StrUtil.toUnderlineCase(c.getColumnKey()));
+            columnDto.setColumnName(String.format("\"%s\"",StrUtil.toUnderlineCase(c.getColumnKey()).toUpperCase()));
             columnDto.setColumnValue(c.getColumnNewValue());
             return columnDto;
         }).collect(Collectors.toList());

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/UseRegisterUpdateService.java

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,14 +27,12 @@ public class UseRegisterUpdateService {
 
     private final JgUseRegistrationServiceImpl useRegistrationService;
 
-    private final CommonServiceImpl commonService;
 
     private final JgRegistrationHistoryServiceImpl jgRegistrationHistoryService;
 
-    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, CommonServiceImpl commonService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService) {
+    public UseRegisterUpdateService(IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper, JgUseRegistrationServiceImpl useRegistrationService, JgRegistrationHistoryServiceImpl jgRegistrationHistoryService) {
         this.idxBizJgRegisterInfoMapper = idxBizJgRegisterInfoMapper;
         this.useRegistrationService = useRegistrationService;
-        this.commonService = commonService;
         this.jgRegistrationHistoryService = jgRegistrationHistoryService;
     }
 
@@ -87,8 +86,29 @@ public class UseRegisterUpdateService {
         }
         jsonObject.put("useRegistrationCode", jgUseRegistration.getUseRegistrationCode());
         // 转化 附件 字段
-        commonService.convertStringToJsonobject(jsonObject, JgUseRegistrationServiceImpl.jsonFields);
+        this.convertStringToJsonObject(jsonObject, JgUseRegistrationServiceImpl.jsonFields);
         return jsonObject;
     }
 
+    public void convertStringToJsonObject(Object obj, String[] jsonFields) {
+        if (obj instanceof JSONObject) {
+            JSONObject jsonObject = (JSONObject) obj;
+            for (String field : jsonFields) {
+                if (jsonObject.get(field) != null && jsonObject.get(field) instanceof String) {
+                    jsonObject.put(field, JSON.parse(JSONObject.toJSONString(jsonObject.get(field))));
+                }
+            }
+        } else if (obj instanceof Map) {
+            Map<String, Object> map = (Map<String, Object>) obj;
+            for (String field : jsonFields) {
+                if (map.containsKey(field) && map.get(field) instanceof String) {
+                    map.put(field, JSON.parse(JSONObject.toJSONString(map.get(field))));
+                }
+            }
+        } else {
+            // 处理其他类型
+            System.out.println("Unsupported Object Type");
+        }
+    }
+
 }