Merge remote-tracking branch 'origin/v3' into v3

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java

@@ -143,11 +143,11 @@ public class AppEnterpriseComplaintController extends BaseController {
             enterpriseComplaint.setEnforceTypeText("入企不扫码");
         }
 
-        // 获取相关事项
-        if (StringUtils.isNotEmpty(enterpriseComplaint.getRelId())) {
-            EnforcementRegistration registration = enforcementRegistrationService.selectEnforcementRegistrationById(enterpriseComplaint.getRelId());
-            enterpriseComplaint.setLawEnforcementIncident(registration.getLawEnforcementItemText());
-        }
+        // 获取相关事项 - 移到 service 里面去了
+//        if (StringUtils.isNotEmpty(enterpriseComplaint.getRelId())) {
+//            EnforcementRegistration registration = enforcementRegistrationService.selectEnforcementRegistrationById(enterpriseComplaint.getRelId());
+//            enterpriseComplaint.setLawEnforcementIncident(registration.getLawEnforcementItemText());
+//        }
 
 
         Map<String, Object> resMap = new HashMap<>();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@@ -63,6 +63,9 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
                 enterpriseComplaint.setBureauDeptName(enforcementRegistration.getBureauDeptName());
                 enterpriseComplaint.setBureauDeptId(enforcementRegistration.getBureauDeptId());
             }
+            // 获取相关事项 - 执法事项
+            enterpriseComplaint.setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText());
+
             //查询民生诉求接口 获取处置进度,判断是否存在诉求工单编码
 //            if(StringUtils.isNotEmpty(enterpriseComplaint.getProWoCode())){
 //