历史登记评价

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

@@ -537,6 +537,14 @@ public class AppEnforcementRegistrationController extends BaseController
             regResults.add(enforcementRegistration);
         }
 
+        //查询行政检查评价
+        EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
+        if (StringUtils.isNotEmpty(regResults.get(0).getUniteCheck())) {
+            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(regResults.get(0).getUniteCheck());
+        } else {
+            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(regResults.get(0).getId());
+        }
+
         for (EnforcementRegistration reg : regResults) {
             // 执法人员1需要展示用户名+执法码
             UserBean userBean = userApi.getUserByUserId(reg.getLawEnforcerId());
@@ -585,12 +593,12 @@ public class AppEnforcementRegistrationController extends BaseController
             // 评价
 
             //查询行政检查评价
-            EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
+//            EnterpriseEvaluate enterpriseEvaluate = new EnterpriseEvaluate();
-//        if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) {
+//            if (StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())) {
-//            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getUniteCheck());
+//                enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByUniteCheck(enforcementRegistration.getUniteCheck());
-//        } else {
+//            } else {
-            enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId());
+//                enterpriseEvaluate = enterpriseEvaluateService.selectEnterpriseEvaluateByRelId(enforcementRegistration.getId());
-//        }
+//            }
             reg.setEnterpriseEvaluate(enterpriseEvaluate);
         }
         Map<String, List> result = new HashMap<>();

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseEvaluateMapper.xml

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEnterpriseEvaluateByUniteCheck" parameterType="String" resultMap="EnterpriseEvaluateResult">
         <include refid="selectEnterpriseEvaluateVo"/>
-        where unite_check = #{id}
+        where batch_id = #{id}
     </select>
         
     <insert id="insertEnterpriseEvaluate" parameterType="EnterpriseEvaluate">