From ebbbcaae5247c11fb00f78430a0bc6092e243621 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 11 Nov 2025 17:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=A8=A1=E5=BC=8F=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CivilizeConstructionServiceImpl.java     | 8 +++++++-
 .../baotou/service/impl/QualitySuperviseServiceImpl.java  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/CivilizeConstructionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/CivilizeConstructionServiceImpl.java
index a67226994..4fe3817ee 100644
--- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/CivilizeConstructionServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/CivilizeConstructionServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.baotou.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -165,7 +166,12 @@ public class CivilizeConstructionServiceImpl extends ServiceImpl<CivilizeConstru
         WorkerInfo info = workerInfoService.getById(user1.getWorkerId());
         String projectSn = processInstance.getTenantId();
         CivilizeConstruction record = new CivilizeConstruction();
-        record.setContractModel(Objects.equals(FlowUtil.getString(formData, "field8651419052293"), "EPC") ? 1 : 2);
+        String field8651419052293 = FlowUtil.getString(formData, "field8651419052293");
+        Integer contractModel = null;
+        if (StrUtil.isNotBlank(field8651419052293)) {
+            contractModel = Objects.equals(field8651419052293, "EPC") ? 1 : 2;
+        }
+        record.setContractModel(contractModel);
         record.setDeliveryLevel(FlowUtil.getString(formData, "field5228419077026"));
         record.setDeviceId(FlowUtil.getPullDownLong(formData, "field7489919113760"));
         record.setProjectGroupId(FlowUtil.getPullDownLong(formData, "field2151319127628"));
diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualitySuperviseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualitySuperviseServiceImpl.java
index a0ac80788..8273844b9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualitySuperviseServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/QualitySuperviseServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.baotou.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -184,7 +185,12 @@ public class QualitySuperviseServiceImpl extends ServiceImpl<QualitySuperviseMap
         SystemUser user1 = systemUserService.getById(user.getId());
         WorkerInfo info = workerInfoService.getById(user1.getWorkerId());
         QualitySupervise record = new QualitySupervise();
-        record.setContractModel(Objects.equals(FlowUtil.getString(formData, "field6263895325071"), "EPC") ? 1 : 2);
+        String field6263895325071 = FlowUtil.getString(formData, "field6263895325071");
+        Integer contractModel = null;
+        if (StrUtil.isNotBlank(field6263895325071)) {
+            contractModel = Objects.equals(field6263895325071, "EPC") ? 1 : 2;
+        }
+        record.setContractModel(contractModel);
         record.setDeliveryLevel(FlowUtil.getString(formData, "field5089995326471"));
         record.setQualitySupervisionAgency(FlowUtil.getString(formData, "field4427127220717"));
         record.setIssuer(FlowUtil.getPullDownLong(formData, "field6606727229026"));