20231120_qiuyh_区域巡检打卡、防患举报、物料web端

邱宇豪

2023-11-20 942fd08345fe0f3b04b4a0e919516257213ad2e5

 hd/pipe/secure/src/main/resources/mapping/RegionInspectionMapper.xml

@@ -29,6 +29,9 @@
      <if test="companyId != null">
        companyId,
      </if>
      <if test="status != null">
        `status`,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="id != null">
@@ -55,6 +58,9 @@
      <if test="companyId != null">
        #{companyId,jdbcType=VARCHAR},
      </if>
      <if test="status != null">
        #{status,jdbcType=INTEGER},
      </if>
    </trim>
    on duplicate key update
    <trim suffixOverrides=",">
@@ -79,6 +85,9 @@
      <if test="companyId != null">
        companyId = #{companyId,jdbcType=VARCHAR},
      </if>
      <if test="status != null">
        `status` = #{status,jdbcType=INTEGER},
      </if>
    </trim>

  </insert>
@@ -99,6 +108,7 @@
                                t.updateTime,
                                t.isUse,
                                t.companyId,
                                t.`status`,
                                GROUP_CONCAT(DISTINCT b.real_name ORDER BY b.job_num SEPARATOR '、') realNames,
                                GROUP_CONCAT(DISTINCT b.user_id ORDER BY b.job_num SEPARATOR '、') userIds,
                                GROUP_CONCAT(DISTINCT d.region ORDER BY c.sort SEPARATOR ',') regions,