|
|
@@ -3,8 +3,8 @@
|
|
|
<mapper namespace="com.goafanti.common.dao.PatentNewMapper">
|
|
|
<resultMap id="BaseResultMap"
|
|
|
type="com.goafanti.common.model.PatentNew">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
<id column="id" jdbcType="INTEGER" property="id" />
|
|
|
<result column="patent_no" jdbcType="VARCHAR"
|
|
|
@@ -51,8 +51,8 @@
|
|
|
<result column="end_date" jdbcType="DATE" property="endDate" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
id, patent_no, `name`, `type`, `status`, apply_date,
|
|
|
authorization_date, patent_amount,
|
|
|
@@ -64,8 +64,8 @@
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey"
|
|
|
parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
select
|
|
|
<include refid="Base_Column_List" />
|
|
|
@@ -74,16 +74,16 @@
|
|
|
</select>
|
|
|
<delete id="deleteByPrimaryKey"
|
|
|
parameterType="java.lang.Integer">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
delete from patent_new
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</delete>
|
|
|
<insert id="insert"
|
|
|
parameterType="com.goafanti.common.model.PatentNew">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
insert into patent_new (id, patent_no, `name`,
|
|
|
`type`, `status`, apply_date,
|
|
|
@@ -114,8 +114,8 @@
|
|
|
</insert>
|
|
|
<insert id="insertSelective"
|
|
|
parameterType="com.goafanti.common.model.PatentNew">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
insert into patent_new
|
|
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
@@ -293,8 +293,8 @@
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective"
|
|
|
parameterType="com.goafanti.common.model.PatentNew">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
update patent_new
|
|
|
<set>
|
|
|
@@ -384,8 +384,8 @@
|
|
|
</update>
|
|
|
<update id="updateByPrimaryKey"
|
|
|
parameterType="com.goafanti.common.model.PatentNew">
|
|
|
- <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
- MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
+ <!-- WARNING - @mbg.generated This element is automatically generated by
|
|
|
+ MyBatis Generator, do not modify. This element was generated on Mon Aug 09
|
|
|
14:41:21 CST 2021. -->
|
|
|
update patent_new
|
|
|
set patent_no = #{patentNo,jdbcType=VARCHAR},
|
|
|
@@ -429,7 +429,7 @@
|
|
|
a.patent_amount as patentAmount,a.delaying_amount delayingAmount ,a.recovery_amount
|
|
|
recoveryAmount, c.commodity_name projectName , c.id tid,tm.salesman_name salesmanName ,
|
|
|
c.receiver_name techName, tm.dep_name depName,ia.name inputName
|
|
|
- from patent_new a left join admin b on a.aid=b.id
|
|
|
+ from patent_new a left join admin b on a.aid=b.id
|
|
|
left join t_order_task c on a.tid =c.id left join t_order_mid tm on c.order_no =tm.order_no
|
|
|
left join admin ia on a.input_id =ia.id
|
|
|
<if test="shiro ==1">
|
|
|
@@ -475,13 +475,19 @@
|
|
|
and b.name like concat('%',#{aname},'%')
|
|
|
</if>
|
|
|
<if test="depName != null">
|
|
|
- and tm.dep_name = #{depName}
|
|
|
+ and tm.dep_name = #{depName}
|
|
|
</if>
|
|
|
<if test="inputDep != null">
|
|
|
- and ia.department_id = #{inputDep}
|
|
|
+ and ia.department_id in
|
|
|
+ <foreach close=")" collection="inputDep" item="deps" open="(" separator=",">
|
|
|
+ #{deps.id}
|
|
|
+ </foreach>
|
|
|
</if>
|
|
|
<if test="followDep != null">
|
|
|
- and b.department_id = #{followDep}
|
|
|
+ and b.department_id in
|
|
|
+ <foreach close=")" collection="followDep" item="f" open="(" separator=",">
|
|
|
+ #{f.id}
|
|
|
+ </foreach>
|
|
|
</if>
|
|
|
<if test="salesmanRemind !=null">
|
|
|
and a.salesman_remind= #{salesmanRemind}
|
|
|
@@ -540,13 +546,19 @@
|
|
|
and b.name like concat('%',#{aname},'%')
|
|
|
</if>
|
|
|
<if test="depName != null">
|
|
|
- and tm.dep_name = #{depName}
|
|
|
+ and tm.dep_name = #{depName}
|
|
|
</if>
|
|
|
<if test="inputDep != null">
|
|
|
- and ia.department_id = #{inputDep}
|
|
|
+ and ia.department_id in
|
|
|
+ <foreach close=")" collection="inputDep" item="deps" open="(" separator=",">
|
|
|
+ #{deps.id}
|
|
|
+ </foreach>
|
|
|
</if>
|
|
|
<if test="followDep != null">
|
|
|
- and b.department_id = #{followDep}
|
|
|
+ and b.department_id in
|
|
|
+ <foreach close=")" collection="followDep" item="f" open="(" separator=",">
|
|
|
+ #{f.id}
|
|
|
+ </foreach>
|
|
|
</if>
|
|
|
<if test="salesmanRemind !=null">
|
|
|
and a.salesman_remind= #{salesmanRemind}
|
|
|
@@ -623,7 +635,7 @@
|
|
|
</update>
|
|
|
<update id="updateBatchByid">
|
|
|
update patent_new
|
|
|
-
|
|
|
+
|
|
|
<set>
|
|
|
<if test="status != null">
|
|
|
status= #{status},
|
|
|
@@ -631,7 +643,7 @@
|
|
|
<if test="aid != null">
|
|
|
aid= #{aid},
|
|
|
</if>
|
|
|
-
|
|
|
+
|
|
|
</set>
|
|
|
where id in
|
|
|
<foreach item="item" collection="list" open="(" separator=","
|
|
|
@@ -661,4 +673,4 @@
|
|
|
a.order_no =b.order_no
|
|
|
where a.id = #{tid}
|
|
|
</select>
|
|
|
-</mapper>
|
|
|
+</mapper>
|