监督端-法律法规代码生成

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelCityMapper.xml

@@ -205,7 +205,7 @@
             and r.bureau_dept_id in <foreach collection="filterDepts" item="bureau_dept_id" open="(" separator="," close=")"> #{bureau_dept_id} </foreach>
         </if>
         <if test="params.dataScope != null and params.dataScope != ''"> ${params.dataScope} </if>
-        GROUP BY r.enterprise_number order by cnt desc limit #{pageSize}
+        GROUP BY r.enterprise_number,r.enterprise_name order by cnt desc limit #{pageSize}
     </select>
 
     <!-- 执法单位执法数量排行 -->
@@ -218,7 +218,7 @@
             and r.bureau_dept_id in <foreach collection="filterDepts" item="bureau_dept_id" open="(" separator="," close=")"> #{bureau_dept_id} </foreach>
         </if>
         <if test="params.dataScope != null and params.dataScope != ''"> ${params.dataScope} </if>
-        GROUP BY r.bureau_dept_id order by cnt desc limit #{pageSize}
+        GROUP BY r.bureau_dept_id,r.bureau_dept_name order by cnt desc limit #{pageSize}
     </select>
 
     <!-- 被投诉单位次数排行 -->
@@ -227,7 +227,7 @@
         <if test="beginTime != null and beginTime != ''"> and c.create_time &gt;= #{beginTime} </if>
         <if test="endTime != null and endTime != ''"> and c.create_time &lt; #{endTime} </if>
         <if test="bureauDeptId != null and bureauDeptId != ''"> and FIND_IN_SET(#{bureauDeptId}, c.complaint_department_ids) </if>
-        GROUP BY c.complaint_department_ids order by cnt desc limit #{pageSize}
+        GROUP BY c.complaint_department_ids,c.complaint_departments order by cnt desc limit #{pageSize}
     </select>
 
     <!-- 委托执法数量及占比 -->

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelDistrictMapper.xml

@@ -217,7 +217,7 @@
             and r.bureau_dept_id in <foreach collection="filterDepts" item="bureau_dept_id" open="(" separator="," close=")"> #{bureau_dept_id} </foreach>
         </if>
         <if test="params.dataScope != null and params.dataScope != ''"> ${params.dataScope} </if>
-        GROUP BY r.enterprise_number order by cnt desc limit #{pageSize}
+        GROUP BY r.enterprise_number,r.enterprise_name order by cnt desc limit #{pageSize}
     </select>
 
     <!-- 执法单位执法数量排行 -->
@@ -231,7 +231,7 @@
             and r.bureau_dept_id in <foreach collection="filterDepts" item="bureau_dept_id" open="(" separator="," close=")"> #{bureau_dept_id} </foreach>
         </if>
         <if test="params.dataScope != null and params.dataScope != ''"> ${params.dataScope} </if>
-        GROUP BY r.bureau_dept_id order by cnt desc limit #{pageSize}
+        GROUP BY r.bureau_dept_id,r.bureau_dept_name order by cnt desc limit #{pageSize}
     </select>
 
     <!-- 被投诉单位次数排行 -->
@@ -240,7 +240,7 @@
         <if test="beginTime != null and beginTime != ''"> and c.create_time &gt;= #{beginTime} </if>
         <if test="endTime != null and endTime != ''"> and c.create_time &lt; #{endTime} </if>
         <if test="bureauDeptId != null and bureauDeptId != ''"> and FIND_IN_SET(#{bureauDeptId}, c.complaint_department_ids) </if>
-        GROUP BY c.complaint_department_ids order by cnt desc limit #{pageSize}
+        GROUP BY c.complaint_department_ids,c.complaint_departments order by cnt desc limit #{pageSize}
     </select>
 
     <!-- 委托执法数量及占比 -->

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/StatisticalPanelMapper.xml

@@ -1653,7 +1653,7 @@
                 ${params.dataScope}
             </if>
         </where>
-        group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time
+        group by DATE_FORMAT(enforcement_time, '%Y-%m') order by MAX(enforcement_time)
     </select>
     <!-- 非行政检查 -->
     <select id="analysis_non_enterprisesIns_time" parameterType="com.zdxt.enforcementcode.domain.bo.SixAnalysisParamsBo" resultType="java.util.Map">
@@ -1679,7 +1679,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </if>
-        group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time
+        group by DATE_FORMAT(enforcement_time, '%Y-%m') order by MAX(enforcement_time)
     </select>
     <!-- 企业 -->
     <select id="analysis_enterprises_time" parameterType="com.zdxt.enforcementcode.domain.bo.SixAnalysisParamsBo" resultType="java.util.Map">
@@ -1711,7 +1711,7 @@
                 ${params.dataScope}
             </if>
         </where>
-        group by DATE_FORMAT(enforcement_time, '%Y-%m') order by enforcement_time
+        group by DATE_FORMAT(enforcement_time, '%Y-%m') order by MAX(enforcement_time)
     </select>
 
     <!-- 非行政检查类型统计 -->
@@ -1740,7 +1740,7 @@
                 ${params.dataScope}
             </if>
         </where>
-        group by r.law_enforcement_type
+        group by r.law_enforcement_type,sdd.dict_label
     </select>
 
 
@@ -1774,6 +1774,6 @@
                 ${params.dataScope}
             </if>
         </where>
-        group by r.law_enforce_category
+        group by r.law_enforce_category,sdd.dict_label
     </select>
 </mapper>

zdxt-modules/zdxt-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -36,9 +36,9 @@
             d.create_by as createBy,
             d.create_time as createTime,
             dept_type as deptType,
-            d.kingdee_org_id as kingdeeOrgId,
-            d.kingdee_org_parent_id as kingdeeOrgParentId,
-            tenant_code as tenantCode,
+           <!-- d.kingdee_org_id as kingdeeOrgId,
+            d.kingdee_org_parent_id as kingdeeOrgParentId,-->
+            <!--tenant_code as tenantCode,-->
             organizationId,
             organizationParentId,
             zzLevel,
@@ -46,7 +46,7 @@
             mappingUnitParentId,
             updateAt,
             createAt,
-            description,
+           <!-- description,-->
             effectOn,
             sequence,
             isDeleted,
@@ -61,24 +61,24 @@
             taskId,
             creditcode,
             zone,
-            simpleName,
-            isStatutoryOrg,
-            isActive,
+           <!-- simpleName,-->
+           <!-- isStatutoryOrg,-->
+            <!--isActive,-->
             unitStatusCode,
             unitStatus,
-            unitType,
-            xzqhCode,
-            xzqh,
-            isCGManager,
-            isBureauOffice,
-            unitTypeCode,
-            dwxzCode,
-            dwxz,
-            unitSysTypeCode,
-            unitSysType,
-            dwxtlbms,
-            unitLevelCode,
-            unitLevel
+          <!--  unitType,-->
+           <!-- xzqhCode-->
+           <!-- xzqh,-->
+           <!-- isCGManager,
+            isBureauOffice,-->
+          unitTypeCode
+            <!-- dwxzCode,
+           dwxz,
+           unitSysTypeCode,
+           unitSysType,
+           dwxtlbms,
+           unitLevelCode,
+           unitLevel-->
         from
             sys_dept d
     </sql>