anderx 1 день назад
Родитель
Сommit
125beb8fdd

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

@@ -10,7 +10,7 @@ import java.util.List;
  * 公出协单详情表(PublicAssistDetails)表数据库访问层
  *
  * @author makejava
- * @since 2026-01-16 14:04:42
+ * @since 2026-01-19 11:40:18
  */
 public interface PublicAssistDetailsMapper {
 

+ 33 - 11
src/main/java/com/goafanti/common/mapper/PublicAssistDetailsMapper.xml

@@ -5,13 +5,15 @@
     <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="type" column="type" 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, type, content_type, content
+        id, prid, pid, pname, type, content_type, content
     </sql>
 
     <!--查询单个-->
@@ -24,26 +26,28 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into public_assist_details(prid, type, content_type, content)
-        values (#{prid}, #{type}, #{contentType}, #{content})
+        insert into public_assist_details(prid, pid, pname, type, content_type, content)
+        values (#{prid}, #{pid}, #{pname}, #{type}, #{contentType}, #{content})
     </insert>
 
     <insert id="insertBatch">
-        insert into public_assist_details(prid, type, content_type, content)
+        insert into public_assist_details(prid, pid, pname, type, content_type, content)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.prid}, #{entity.type}, #{entity.contentType}, #{entity.content})
+            (#{entity.prid}, #{entity.pid}, #{entity.pname}, #{entity.type}, #{entity.contentType}, #{entity.content})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into public_assist_details(prid, type, content_type, content)
+        insert into public_assist_details(prid, pid, pname, type, content_type, content)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.prid}, #{entity.type}, #{entity.contentType}, #{entity.content})
+            (#{entity.prid}, #{entity.pid}, #{entity.pname}, #{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)
@@ -56,7 +60,13 @@
             <if test="prid != null">
                 prid = #{prid},
             </if>
-            <if test="type != null">
+            <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>
             <if test="contentType != null">
@@ -82,7 +92,13 @@
             <if test="prid != null">
                 and prid = #{prid}
             </if>
-            <if test="type != null">
+            <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>
             <if test="contentType != null">
@@ -108,7 +124,13 @@
             <if test="prid != null">
                 and prid = #{prid}
             </if>
-            <if test="type != null">
+            <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>
             <if test="contentType != null">

+ 29 - 5
src/main/java/com/goafanti/common/model/PublicAssistDetails.java

@@ -7,10 +7,10 @@ import java.io.Serializable;
  * 公出协单详情表(PublicAssistDetails)实体类
  *
  * @author makejava
- * @since 2026-01-16 14:04:42
+ * @since 2026-01-19 11:40:18
  */
 public class PublicAssistDetails implements Serializable {
-    private static final long serialVersionUID = -18990904381372183L;
+    private static final long serialVersionUID = -83261976958621030L;
 
     private Integer id;
     /**
@@ -18,9 +18,17 @@ 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 Integer type;
+    private String type;
     /**
      * 内容 0=其他,1=会议,2=写方案,3=接待
      */
@@ -47,11 +55,27 @@ public class PublicAssistDetails implements Serializable {
         this.prid = prid;
     }
 
-    public Integer getType() {
+    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;
     }
 
-    public void setType(Integer type) {
+    public void setType(String type) {
         this.type = type;
     }
 

+ 13 - 3
src/main/java/com/goafanti/weChat/bo/InputPublicRelease.java

@@ -67,15 +67,25 @@ public class InputPublicRelease extends PublicRelease {
 
 	private String uais;
 
-	private Integer assistType;
+	private String assistType;
 	private Integer assistContentType;
 	private String assistContent;
 
-	public Integer getAssistType() {
+	private String pid;
+
+	public String getPid() {
+		return pid;
+	}
+
+	public void setPid(String pid) {
+		this.pid = pid;
+	}
+
+	public String getAssistType() {
 		return assistType;
 	}
 
-	public void setAssistType(Integer assistType) {
+	public void setAssistType(String assistType) {
 		this.assistType = assistType;
 	}
 

+ 9 - 2
src/main/java/com/goafanti/weChat/bo/OutPublicStatistics.java

@@ -20,8 +20,15 @@ public class OutPublicStatistics {
 	private Integer wsh;
 	@Excel(name = "驳回次数")
 	private Integer bh;
-	
-	
+
+	public Integer getXds() {
+		return xds;
+	}
+
+	public void setXds(Integer xds) {
+		this.xds = xds;
+	}
+
 	public Integer getDk() {
 		return dk;
 	}

+ 16 - 3
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -23,6 +23,8 @@ import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.weChat.bo.*;
 import com.goafanti.weChat.service.PublicReleaseService;
+import com.kede.common.dao.PublicReleaseTypeMapper;
+import com.kede.common.model.PublicReleaseType;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
@@ -66,8 +68,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Autowired
 	private PublicExamineMapper publicExamineMapper;
 	@Autowired
-	private AdminUserCountMapper adminUserCountMapper;
-	@Autowired
 	private PublicReleaseClockMapper publicReleaseClockMapper;
 	@Autowired
 	private PublicReleaseDateClockMapper publicReleaseDateClockMapper;
@@ -104,9 +104,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	private UserArchivesInterviewMapper userArchivesInterviewMapper;
 	@Autowired
 	private UserInterviewProjectMapper userInterviewProjectMapper;
-
 	@Autowired
 	private PublicAssistDetailsMapper publicAssistDetailsMapper;
+	@Autowired
+	private PublicReleaseTypeMapper publicReleaseTypeMapper;
+
 
 	@Override
 	@Transactional
@@ -149,6 +151,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			pad.setContentType(in.getAssistContentType());
 			pad.setContent(in.getAssistContent());
 			publicAssistDetailsMapper.insert(pad);
+			if (in.getAssistType().contains(",")){
+				String[] split = in.getAssistType().split(",");
+				List<PublicReleaseType> list =new ArrayList<>();
+				for (String s : split) {
+					PublicReleaseType pt=new PublicReleaseType();
+					pt.setPrid(in.getId());
+					pt.setType(s);
+					list.add(pt);
+				}
+				publicReleaseTypeMapper.insertBatch(list);
+			}
 		}
 		if (in.getType()==1&&in.getOrderNo()!=null){
 			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());

+ 84 - 0
src/main/java/com/kede/common/dao/PublicReleaseTypeMapper.java

@@ -0,0 +1,84 @@
+package com.kede.common.dao;
+
+import com.kede.common.model.PublicReleaseType;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 公出协单项目表(查询列表多选使用)(PublicReleaseType)表数据库访问层
+ *
+ * @author makejava
+ * @since 2026-01-19 11:44:13
+ */
+public interface PublicReleaseTypeMapper {
+
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    PublicReleaseType selectById(Integer id);
+
+
+    /**
+     * 查询指定行数据
+     *
+     * @param publicReleaseType 查询条件
+     * @param pageable          分页对象
+     * @return 对象列表
+     */
+    List<PublicReleaseType> findPublicReleaseTypeList(PublicReleaseType publicReleaseType);
+
+    /**
+     * 统计总行数
+     *
+     * @param publicReleaseType 查询条件
+     * @return 总行数
+     */
+    int findPublicReleaseTypeCount(PublicReleaseType publicReleaseType);
+
+    /**
+     * 新增数据
+     *
+     * @param publicReleaseType 实例对象
+     * @return 影响行数
+     */
+    int insert(PublicReleaseType publicReleaseType);
+
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<PublicReleaseType> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<PublicReleaseType> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<PublicReleaseType> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<PublicReleaseType> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param publicReleaseType 实例对象
+     * @return 影响行数
+     */
+    int update(PublicReleaseType publicReleaseType);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+}
+

+ 109 - 0
src/main/java/com/kede/common/mapper/PublicReleaseTypeMapper.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kede.common.dao.PublicReleaseTypeMapper">
+
+    <resultMap type="com.kede.common.model.PublicReleaseType" id="PublicReleaseTypeMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="prid" column="prid" jdbcType="INTEGER"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="PublicReleaseTypeAllSql">
+        id, prid, type
+    </sql>
+
+    <!--查询单个-->
+    <select id="selectById" resultMap="PublicReleaseTypeMap">
+        select
+        <include refid="PublicReleaseTypeAllSql"/>
+        from public_release_type
+        where id = #{id}
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into public_release_type(prid, type)
+        values (#{prid}, #{type})
+    </insert>
+
+    <insert id="insertBatch">
+        insert into public_release_type(prid, type)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.prid}, #{entity.type})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into public_release_type(prid, type)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.prid}, #{entity.type})
+        </foreach>
+        on duplicate key update
+        prid = values(prid),
+        type = values(type)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update public_release_type
+        <set>
+            <if test="prid != null">
+                prid = #{prid},
+            </if>
+            <if test="type != null and type != ''">
+                type = #{type},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--查询指定行数据-->
+    <select id="findPublicReleaseTypeList" resultMap="PublicReleaseTypeMap">
+        select
+        <include refid="PublicReleaseTypeAllSql"/>
+
+        from public_release_type
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="prid != null">
+                and prid = #{prid}
+            </if>
+            <if test="type != null and type != ''">
+                and type = #{type}
+            </if>
+        </where>
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+
+    <!--统计总行数-->
+    <select id="findPublicReleaseTypeCount" resultType="java.lang.Integer">
+        select count(1)
+        from public_release_type
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="prid != null">
+                and prid = #{prid}
+            </if>
+            <if test="type != null and type != ''">
+                and type = #{type}
+            </if>
+        </where>
+    </select>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from public_release_type
+        where id = #{id}
+    </delete>
+
+</mapper>
+

+ 51 - 0
src/main/java/com/kede/common/model/PublicReleaseType.java

@@ -0,0 +1,51 @@
+package com.kede.common.model;
+
+import java.io.Serializable;
+
+
+/**
+ * 公出协单项目表(查询列表多选使用)(PublicReleaseType)实体类
+ *
+ * @author makejava
+ * @since 2026-01-19 11:44:13
+ */
+public class PublicReleaseType implements Serializable {
+    private static final long serialVersionUID = -24328109122388311L;
+
+    private Integer id;
+    /**
+     * 公出详情编号
+     */
+    private Integer prid;
+    /**
+     * 协单项目
+     */
+    private String type;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getPrid() {
+        return prid;
+    }
+
+    public void setPrid(Integer prid) {
+        this.prid = prid;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+}
+