添加公共庫

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -270,7 +270,6 @@
       :materialsInfo="materialsInfo"
     ></PreviewMaterials>
 
-
     <!-- 公共库 -->
     <CommonLib :depList="depList" :libVisible.sync="libVisible"></CommonLib>
   </div>

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -118,11 +118,15 @@ export default {
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
+      siteId: local.getLocal("sampleSiteId")
+          ? local.getLocal("sampleSiteId")
+          : "",
       form: {
         materialName: "", // 材料名称
         materiaFullName: "", // 材料全名
         source: 1, // 来源
         matterId: "", // 事项id
+        siteId: this.siteId, // 站點id
         matterNo: "", // 事项编号
         fileName: "", // 附件名称
         fileUrl: "", // 附件地址

sample-form-manager/db/module.sql

@@ -117,10 +117,10 @@ CREATE TABLE mortals_xhx_matter
 -- 事项申请材料业务表
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
-CREATE TABLE mortals_xhx_matter_datum
-(
+CREATE TABLE mortals_xhx_matter_datum(
      `id` bigint(20)   AUTO_INCREMENT  COMMENT '主键，自增长',
      `matterId` bigint(20)     COMMENT '事项matter id',
+     `siteId` bigint(20)     COMMENT '站点ID',
      `deptId` bigint(20)     COMMENT '部门ID',
      `deptCode` varchar(64)     COMMENT '部门编号',
      `materialName` varchar(1024) NOT NULL    COMMENT '材料名',
@@ -138,6 +138,8 @@ CREATE TABLE mortals_xhx_matter_datum
      PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
 
+
+
 -- ----------------------------
 -- 事项材料公共库表
 -- ----------------------------

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
  * 事项申请材料业务实体对象
  *
  * @author zxfei
- * @date 2022-11-10
+ * @date 2022-11-11
  */
 
 public class MatterDatumEntity extends MatterDatumVo {
@@ -20,6 +20,10 @@ public class MatterDatumEntity extends MatterDatumVo {
      * 事项matter id
      */
     private Long matterId;
+    /**
+     * 站点ID
+     */
+    private Long siteId;
     /**
      * 部门ID
      */
@@ -82,6 +86,20 @@ public class MatterDatumEntity extends MatterDatumVo {
     public void setMatterId(Long matterId){
         this.matterId = matterId;
     }
+    /**
+     * 获取 站点ID
+     * @return Long
+     */
+    public Long getSiteId(){
+        return siteId;
+    }
+    /**
+     * 设置 站点ID
+     * @param siteId
+     */
+    public void setSiteId(Long siteId){
+        this.siteId = siteId;
+    }
     /**
      * 获取 部门ID
      * @return Long
@@ -259,6 +277,7 @@ public class MatterDatumEntity extends MatterDatumVo {
     public String toString(){
         StringBuilder sb = new StringBuilder("");
         sb.append(",matterId:").append(getMatterId());
+        sb.append(",siteId:").append(getSiteId());
         sb.append(",deptId:").append(getDeptId());
         sb.append(",deptCode:").append(getDeptCode());
         sb.append(",materialName:").append(getMaterialName());
@@ -277,6 +296,8 @@ public class MatterDatumEntity extends MatterDatumVo {
 
         this.matterId = null;
 
+        this.siteId = null;
+
         this.deptId = null;
 
         this.deptCode = "";

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
  * 事项申请材料业务查询对象
  *
  * @author zxfei
- * @date 2022-11-10
+ * @date 2022-11-11
  */
 public class MatterDatumQuery extends MatterDatumEntity {
     /** 开始 主键，自增长 */
@@ -33,6 +33,18 @@ public class MatterDatumQuery extends MatterDatumEntity {
     /** 事项matter id列表 */
     private List <Long> matterIdList;
 
+    /** 开始 站点ID */
+    private Long siteIdStart;
+
+    /** 结束 站点ID */
+    private Long siteIdEnd;
+
+    /** 增加 站点ID */
+    private Long siteIdIncrement;
+
+    /** 站点ID列表 */
+    private List <Long> siteIdList;
+
     /** 开始 部门ID */
     private Long deptIdStart;
 
@@ -271,6 +283,70 @@ public class MatterDatumQuery extends MatterDatumEntity {
         this.matterIdList = matterIdList;
     }
 
+    /**
+     * 获取 开始 站点ID
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点ID
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点ID
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点ID
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点ID
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点ID
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点ID
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点ID
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
     /**
      * 获取 开始 部门ID
      * @return deptIdStart
@@ -899,6 +975,51 @@ public class MatterDatumQuery extends MatterDatumEntity {
         return this;
     }
 
+    /**
+     * 设置  站点ID
+     * @param siteId
+     */
+    public MatterDatumQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点ID
+     * @param siteIdStart
+     */
+    public MatterDatumQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点ID
+     * @param siteIdEnd
+     */
+    public MatterDatumQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点ID
+     * @param siteIdIncrement
+     */
+    public MatterDatumQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点ID
+     * @param siteIdList
+     */
+    public MatterDatumQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
     /**
      * 设置  部门ID
      * @param deptId

sample-form-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"mybatis-3-mapper.dtd">
+        "mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.matter.dao.ibatis.MatterDatumDaoImpl">
 
     <!-- 字段和属性映射 -->
     <resultMap type="MatterDatumEntity" id="MatterDatumEntity-Map">
         <id  property="id" column="id" />
         <result property="matterId" column="matterId" />
+        <result property="siteId" column="siteId" />
         <result property="deptId" column="deptId" />
         <result property="deptCode" column="deptCode" />
         <result property="materialName" column="materialName" />
@@ -34,6 +35,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
                 a.matterId,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
                 a.deptId,
             </if>
@@ -81,18 +85,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="MatterDatumEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_matter_datum
-        (matterId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
+        (matterId,siteId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
-        (#{matterId},#{deptId},#{deptCode},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
+        (#{matterId},#{siteId},#{deptId},#{deptCode},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_matter_datum
-        (matterId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
+        (matterId,siteId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.matterId},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -108,6 +112,12 @@
             <if test="(colPickMode==0 and data.containsKey('matterIdIncrement')) or (colPickMode==1 and !data.containsKey('matterIdIncrement'))">
                 a.matterId=ifnull(a.matterId,0) + #{data.matterIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
                 a.deptId=#{data.deptId},
             </if>
@@ -192,6 +202,18 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
             <trim prefix="deptId=(case" suffix="ELSE deptId end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <choose>
@@ -463,6 +485,27 @@
             ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList')">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
         <if test="conditionParamRef.containsKey('deptId')">
             <if test="conditionParamRef.deptId != null ">
                 ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
@@ -732,6 +775,11 @@
                     <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('deptId')">
                     a.deptId
                     <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>