Browse Source

非公出协单开发

anderx 19 hours ago
parent
commit
3b559d6263

+ 2 - 2
src/main/java/com/goafanti/common/dao/PublicAssistDetailsMapper.java

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.PublicAssistDetails;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -9,7 +10,7 @@ import java.util.List;
  * 公出协单详情表(PublicAssistDetails)表数据库访问层
  *
  * @author makejava
- * @since 2026-01-19 11:40:18
+ * @since 2026-01-19 15:02:01
  */
 public interface PublicAssistDetailsMapper {
 
@@ -80,6 +81,5 @@ public interface PublicAssistDetailsMapper {
      */
     int deleteById(Integer id);
 
-    PublicAssistDetails selectByPrid(Integer id);
 }
 

+ 12 - 34
src/main/java/com/goafanti/common/mapper/PublicAssistDetailsMapper.xml

@@ -5,15 +5,13 @@
     <resultMap type="com.goafanti.common.model.PublicAssistDetails" id="PublicAssistDetailsMap">
         <result property="id" column="id" jdbcType="INTEGER"/>
         <result property="prid" column="prid" jdbcType="INTEGER"/>
-        <result property="pid" column="pid" jdbcType="VARCHAR"/>
-        <result property="pname" column="pname" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="VARCHAR"/>
         <result property="contentType" column="content_type" jdbcType="INTEGER"/>
         <result property="content" column="content" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="PublicAssistDetailsAllSql">
-        id, prid, pid, pname, type, content_type, content
+        id, prid, type, content_type, content
     </sql>
 
     <!--查询单个-->
@@ -26,28 +24,26 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into public_assist_details(prid, pid, pname, type, content_type, content)
-        values (#{prid}, #{pid}, #{pname}, #{type}, #{contentType}, #{content})
+        insert into public_assist_details(prid, type, content_type, content)
+        values (#{prid}, #{type}, #{contentType}, #{content})
     </insert>
 
     <insert id="insertBatch">
-        insert into public_assist_details(prid, pid, pname, type, content_type, content)
+        insert into public_assist_details(prid, type, content_type, content)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.prid}, #{entity.pid}, #{entity.pname}, #{entity.type}, #{entity.contentType}, #{entity.content})
+            (#{entity.prid}, #{entity.type}, #{entity.contentType}, #{entity.content})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into public_assist_details(prid, pid, pname, type, content_type, content)
+        insert into public_assist_details(prid, type, content_type, content)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.prid}, #{entity.pid}, #{entity.pname}, #{entity.type}, #{entity.contentType}, #{entity.content})
+            (#{entity.prid}, #{entity.type}, #{entity.contentType}, #{entity.content})
         </foreach>
         on duplicate key update
         prid = values(prid),
-        pid = values(pid),
-        pname = values(pname),
         type = values(type),
         content_type = values(content_type),
         content = values(content)
@@ -60,12 +56,6 @@
             <if test="prid != null">
                 prid = #{prid},
             </if>
-            <if test="pid != null and pid != ''">
-                pid = #{pid},
-            </if>
-            <if test="pname != null and pname != ''">
-                pname = #{pname},
-            </if>
             <if test="type != null and type != ''">
                 type = #{type},
             </if>
@@ -92,12 +82,6 @@
             <if test="prid != null">
                 and prid = #{prid}
             </if>
-            <if test="pid != null and pid != ''">
-                and pid = #{pid}
-            </if>
-            <if test="pname != null and pname != ''">
-                and pname = #{pname}
-            </if>
             <if test="type != null and type != ''">
                 and type = #{type}
             </if>
@@ -124,12 +108,6 @@
             <if test="prid != null">
                 and prid = #{prid}
             </if>
-            <if test="pid != null and pid != ''">
-                and pid = #{pid}
-            </if>
-            <if test="pname != null and pname != ''">
-                and pname = #{pname}
-            </if>
             <if test="type != null and type != ''">
                 and type = #{type}
             </if>
@@ -142,7 +120,6 @@
         </where>
     </select>
 
-
     <!--通过主键删除-->
     <delete id="deleteById">
         delete
@@ -151,10 +128,11 @@
     </delete>
 
     <select id="selectByPrid" resultMap="PublicAssistDetailsMap">
-    select
-    <include refid="PublicAssistDetailsAllSql"/>
-    from public_assist_details
-    where prid = #{id}
+        select
+        <include refid="PublicAssistDetailsAllSql"/>
+        from public_assist_details
+        where prid = #{id}
     </select>
+
 </mapper>
 

+ 2 - 26
src/main/java/com/goafanti/common/model/PublicAssistDetails.java

@@ -7,10 +7,10 @@ import java.io.Serializable;
  * 公出协单详情表(PublicAssistDetails)实体类
  *
  * @author makejava
- * @since 2026-01-19 11:40:18
+ * @since 2026-01-19 15:02:01
  */
 public class PublicAssistDetails implements Serializable {
-    private static final long serialVersionUID = -83261976958621030L;
+    private static final long serialVersionUID = 271449998375743409L;
 
     private Integer id;
     /**
@@ -18,14 +18,6 @@ public class PublicAssistDetails implements Serializable {
      */
     private Integer prid;
     /**
-     * 协单项目
-     */
-    private String pid;
-    /**
-     * 协单项目名称
-     */
-    private String pname;
-    /**
      * 分类 0=其他,1=高企认定,2=会员服务,3=科技项目,4=研动力系统,5=知识产权,6=军工,7=涉密,8=技术合同登记,9=第三方认证项目
      */
     private String type;
@@ -55,22 +47,6 @@ public class PublicAssistDetails implements Serializable {
         this.prid = prid;
     }
 
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid;
-    }
-
-    public String getPname() {
-        return pname;
-    }
-
-    public void setPname(String pname) {
-        this.pname = pname;
-    }
-
     public String getType() {
         return type;
     }