diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java
index b0073dd2..8d28b084 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java
@@ -1,10 +1,16 @@
 package com.zdxt.app.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zdxt.auth.dto.DictDataBean;
+import com.zdxt.auth.feign.DictDataApi;
 import com.zdxt.auth.feign.ZdxtFileCommonApi;
+import com.zdxt.code.domain.EnforcementRegistration;
 import com.zdxt.code.domain.EnterpriseComplaint;
+import com.zdxt.code.domain.EnterpriseLawEnforcement;
 import com.zdxt.code.domain.MssqAddOrder;
+import com.zdxt.code.service.IEnforcementRegistrationService;
 import com.zdxt.code.service.IEnterpriseComplaintService;
+import com.zdxt.code.service.IEnterpriseLawEnforcementService;
 import com.zdxt.code.service.MssqApiService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
@@ -43,6 +49,8 @@ public class AppEnterpriseComplaintController extends BaseController {
     private IEnterpriseComplaintService enterpriseComplaintService;
     @Autowired
     private ZdxtFileCommonApi zdxtFileCommonApi;
+    @Autowired private DictDataApi dictDataApi;
+    @Autowired private IEnforcementRegistrationService enforcementRegistrationService;
     @Autowired
     private MssqApiService mssqApiService;
 
@@ -122,6 +130,28 @@ public class AppEnterpriseComplaintController extends BaseController {
     @ResponseBody
     public ZDResponse queryById(String id) {
         EnterpriseComplaint enterpriseComplaint = enterpriseComplaintService.selectEnterpriseComplaintById(id);
+        // 获取投诉类型
+        if (null != enterpriseComplaint.getEnforceType()) {
+            DictDataBean dictParams = new DictDataBean();
+            dictParams.setDictType("caseType");
+            List<DictDataBean> dicts = dictDataApi.getDictData(dictParams);
+            for (DictDataBean d : dicts) {
+                if (d.getDictValue().equals(enterpriseComplaint.getEnforceType().toString())) {
+                    enterpriseComplaint.setEnforceTypeText(d.getDictLabel());
+                    break;
+                }
+            }
+        } else {
+            enterpriseComplaint.setEnforceTypeText("入企不扫码");
+        }
+
+        // 获取相关事项
+        if (StringUtils.isNotEmpty(enterpriseComplaint.getRelId())) {
+            EnforcementRegistration registration = enforcementRegistrationService.selectEnforcementRegistrationById(enterpriseComplaint.getRelId());
+            enterpriseComplaint.setLawEnforcementIncident(registration.getLawEnforcementItemText());
+        }
+
+
         Map<String, Object> resMap = new HashMap<>();
         if (StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())) {
             MssqAddOrder mparams = new MssqAddOrder();
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
index 8a17c9d6..9467dc75 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
@@ -82,6 +82,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
     @Override
     public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint)
     {
+        if ("入企不扫码".equals(enterpriseComplaint.getEnforceTypeText())) {
+            enterpriseComplaint.setEnforceType(null);
+        }
         UserBean user = userApi.getUserByUserId(enterpriseComplaint.getUserId());
         System.out.println("========================");
         System.out.println("enterpriseComplaint.getUserId : "+ enterpriseComplaint.getUserId());