Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

 src/main/java/com/nanometer/smartlab/dao/SysProjectDao.xml

@@ -11,6 +11,7 @@
    <result property="createrUser" column="creater_user"></result>
    <result property="createTime" column="create_time"></result>
    <result property="username" column="userName"></result>
    <result property="project" column="project"></result>
  </resultMap>

  <sql id="queryWhereSql">
@@ -46,6 +47,17 @@
    <if test="first != null and pageSize != null">
      limit #{first}, #{pageSize}
    </if>
  </select>

  <select id="selectDistinctProjects" parameterType="java.util.Map" resultMap="SysProject">
      SELECT
          sp.*
      FROM
          sys_project sp
          WHERE sp.valid_flag = 1
          AND sp.project is not null
      GROUP BY
          sp.project
  </select>


@@ -111,14 +123,21 @@
      limit #{first}, #{pageSize}
    </if>
  </select>
  <select id="selectByProject" resultType="java.lang.Integer">
        select count(0)
        from sys_project
        where valid_flag = 1
        and project = #{0}

  </select>

  <insert id="insertSysProject" parameterType="com.nanometer.smartlab.entity.SysProject">
    insert into sys_project(id, project_id,project_name,sys_user_id,remark,valid_flag,creater_user,create_time)
    values (#{id}, #{projectId}, #{projectName}, #{sysUserId}, #{remark},#{validFlag},#{createrUser},now())
    insert into sys_project(id, project_id,project_name,sys_user_id,remark,valid_flag,creater_user,create_time,project)
    values (#{id}, #{projectId}, #{projectName}, #{sysUserId}, #{remark},#{validFlag},#{createrUser},now(),#{project})
  </insert>

  <update id="updateSysProject" parameterType="com.nanometer.smartlab.entity.SysProject">
    update sys_project set project_id=#{projectId}, project_name=#{projectName}, sys_user_id=#{sysUserId}, remark=#{remark} where id=#{id}
    update sys_project set project_id=#{projectId}, project_name=#{projectName}, sys_user_id=#{sysUserId}, remark=#{remark} ,project=#{project} where id=#{id}
  </update>

  <update id="deleteSysProjects" parameterType="java.util.List">