正式环境bug修改

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java

@@ -38,6 +38,7 @@ public class DictionaryItemServiceImpl extends ServiceImpl<DictionaryItemMapper,
      * @param dictionaryEncoding
      * @return
      */
+    @Override
     public List<DictionaryItem> getDictList(String dictionaryEncoding, String projectSn) {
         if (StringUtils.isNotBlank(projectSn)) {
             String newEncoding = dictionaryEncoding + "_" + projectSn;

src/main/java/com/zhgd/xmgl/modules/project/controller/ProjectEnterpriseController.java

@@ -59,6 +59,7 @@ public class ProjectEnterpriseController {
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "cbsProjectType", value = "项目类型（字典）", paramType = "body", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "isCountMainEnterprise", value = "1是总包", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping(value = "/list")
     public Result<IPage<EnterpriseInfo>> queryPageList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectEnterpriseMapper.xml

@@ -142,6 +142,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="param.isCountMainEnterprise == '1'.toString()">
+            and b.parent_project_enterprise_id = 0
+        </if>
         order by b.sort_num
     </select>
 

src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/AiAnalyseHardWareAlarmRecordMapper.xml

@@ -209,7 +209,8 @@
             parameterType="java.util.Map">
         SELECT COUNT(1) as alarmNum,
         DATE_FORMAT(w1.create_time, '%Y-%m-%d') as date,
-        w1.alarm_type as alarmType
+        w1.alarm_type as alarmType,
+        w1.project_sn
         from ai_analyse_hard_ware_alarm_record w1
         INNER JOIN project a ON w1.project_sn = a.project_sn
         LEFT JOIN company cp ON a.company_sn = cp.company_sn

src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java

@@ -284,7 +284,7 @@ public class XzSecurityQualityInspectionRecordController {
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "body", required = false, dataType = "String"),
             @ApiImplicitParam(name = "inspectEndTime", value = "检查结束时间", paramType = "body", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "isStatsByWeek", value = "按周统计（统计一个月，1-7号算一周类推）1是", paramType = "body", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "isStatsByWeek", value = "按周统计本月（统计一个月，1-7号算一周类推）1是", paramType = "body", required = false, dataType = "Integer"),
     })
     @PostMapping(value = "/selectQualityStatisticsNumList")
     public Result<List<XzSecurityQualityInspectionRecordTotalVo>> selectQualityStatisticsNumList(@RequestBody Map<String, Object> map) {

src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml

@@ -185,6 +185,9 @@
         and t.status != 6
         <include refid="whereCondition">
         </include>
+        <if test="param.isStatsByWeek == '1'.toString()">
+            and t.inspect_time <![CDATA[>=]]> concat(date_format(current_date,'%Y-%m'),'-01 00:00:00')
+        </if>
         <if test="param.isStatsByWeek == '1'.toString()">
             group by whichWeekOfMonth
         </if>