Merge branch 'fix_foton_20231031' into 'dev_20230829_change'

Fix foton 20231031

See merge request laws-foton-slrs/foton-slrs-system-rest!131

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -70,6 +70,7 @@
         <result property="area" column="area"></result>
         <result property="rqbJson" column="rqb_json"></result>
         <result property="tsJson" column="ts_json"></result>
+        <result property="score" column="score" />
         <result property="esMatingRelations" column="es_mating_relations"/>
         <result property="esStandRelations" column="es_stand_relations"/>
         <result property="isRelate" column="is_relate"/>
@@ -147,6 +148,7 @@
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
         es_revise_plan.LXD,
+        es_revise_plan.score,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName,
@@ -219,6 +221,7 @@
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
         es_revise_plan.LXD,
+        es_revise_plan.score,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         sar_bussioness_stand.stand_number as standNum,
@@ -301,6 +304,7 @@
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
         es_revise_plan.LXD,
+        es_revise_plan.score,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName,
@@ -544,6 +548,7 @@
         es_revise_plan.technologic,
         es_revise_plan.buss_sort,
         es_revise_plan.LXD,
+        es_revise_plan.score,
         sar_bussioness_stand.STAND_CODE as rqbName,
         sar_bussioness_stand.STAND_SORT as standType,
         (select group_concat(ts_institution.name order by ts_institution.name) from ts_institution where find_in_set(ts_institution.id,unit) ORDER BY find_in_set(ts_institution.id,unit)) as unitName,

adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml

@@ -124,4 +124,14 @@
         and process_node = '标准法规部高级经理审核'
         group by user_id
     </select>
+    <select id="selectDTPJ" resultType="java.lang.Integer">
+        select
+            count(1)
+        from
+            quality_evaluation
+        where
+            law_id = #{lawId}
+          and process_node = '动态评价'
+        group by user_id;
+    </select>
 </mapper>