公共库增加材料附件数据，站点事项增加url

single-matter/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -265,6 +265,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
             siteMatterEntity.setEventTypeShow(item.getEventTypeShow());
             siteMatterEntity.setViewsCount(0l);
             siteMatterEntity.setIsConvert(0);
+            siteMatterEntity.setUrl(item.getUrl());
             siteMatterEntity.setDeptName(deptEntity == null ? "" : deptEntity.getName());
             siteMatterEntity.setDeptId(deptEntity == null ? -1L : deptEntity.getId());
             siteMatterEntity.setCreateUserId(context == null ? 1L : context.getUser() == null ? 1L : context.getUser().getId());

single-matter/src/main/java/com/mortals/xhx/module/site/model/SiteMatterEntity.java

@@ -64,6 +64,10 @@ public class SiteMatterEntity extends SiteMatterVo {
      * 是否生成本地附件
      */
     private Integer isConvert;
+    /**
+     * 事项详情链接
+     */
+    private String url;
 
 
 
@@ -236,6 +240,20 @@ public class SiteMatterEntity extends SiteMatterVo {
     public void setIsConvert(Integer isConvert){
         this.isConvert = isConvert;
     }
+    /**
+     * 获取 事项详情链接
+     * @return String
+     */
+    public String getUrl(){
+        return url;
+    }
+    /**
+     * 设置 事项详情链接
+     * @param url
+     */
+    public void setUrl(String url){
+        this.url = url;
+    }
 
 
 
@@ -270,6 +288,7 @@ public class SiteMatterEntity extends SiteMatterVo {
         sb.append(",eventTypeShow:").append(getEventTypeShow());
         sb.append(",viewsCount:").append(getViewsCount());
         sb.append(",isConvert:").append(getIsConvert());
+        sb.append(",url:").append(getUrl());
         return sb.toString();
     }
 
@@ -298,5 +317,7 @@ public class SiteMatterEntity extends SiteMatterVo {
         this.viewsCount = 0L;
 
         this.isConvert = 0;
+
+        this.url = "";
     }
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/site/model/SiteMatterQuery.java

@@ -186,6 +186,11 @@ public class SiteMatterQuery extends SiteMatterEntity {
     /** 结束 更新时间 */
     private String updateTimeEnd;
 
+    /** 事项详情链接 */
+    private List<String> urlList;
+
+    /** 事项详情链接排除列表 */
+    private List <String> urlNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<SiteMatterQuery> orConditionList;
 
@@ -1179,6 +1184,38 @@ public class SiteMatterQuery extends SiteMatterEntity {
         this.updateTimeEnd = updateTimeEnd;
     }
 
+    /**
+     * 获取 事项详情链接
+     * @return urlList
+     */
+    public List<String> getUrlList(){
+        return this.urlList;
+    }
+
+    /**
+     * 设置 事项详情链接
+     * @param urlList
+     */
+    public void setUrlList(List<String> urlList){
+        this.urlList = urlList;
+    }
+
+    /**
+     * 获取 事项详情链接
+     * @return urlNotList
+     */
+    public List<String> getUrlNotList(){
+        return this.urlNotList;
+    }
+
+    /**
+     * 设置 事项详情链接
+     * @param urlNotList
+     */
+    public void setUrlNotList(List<String> urlNotList){
+        this.urlNotList = urlNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1781,6 +1818,25 @@ public class SiteMatterQuery extends SiteMatterEntity {
     }
 
 
+
+    /**
+     * 设置 事项详情链接
+     * @param url
+     */
+    public SiteMatterQuery url(String url){
+        setUrl(url);
+        return this;
+    }
+
+    /**
+     * 设置 事项详情链接
+     * @param urlList
+     */
+    public SiteMatterQuery urlList(List<String> urlList){
+        this.urlList = urlList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

single-matter/src/main/java/com/mortals/xhx/module/site/model/vo/SiteDatumLibraryVo.java

 package com.mortals.xhx.module.site.model.vo;
+
 import com.mortals.framework.model.BaseEntityLong;
-import com.mortals.xhx.module.site.model.SiteDatumLibraryEntity;
-import java.util.ArrayList;
+import com.mortals.xhx.module.matter.model.MatterDatumFileEntity;
+import lombok.Data;
+
 import java.util.List;
 /**
 * 站点材料公共库视图对象
@@ -9,6 +11,7 @@ import java.util.List;
 * @author zxfei
 * @date 2023-03-10
 */
+@Data
 public class SiteDatumLibraryVo extends BaseEntityLong {
-
+    private List<MatterDatumFileEntity> datumFileList;
 }
\ No newline at end of file

single-matter/src/main/java/com/mortals/xhx/module/site/service/impl/SiteDatumLibraryServiceImpl.java

 package com.mortals.xhx.module.site.service.impl;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.matter.model.MatterDatumEntity;
-import com.mortals.xhx.module.matter.model.MatterDatumQuery;
-import com.mortals.xhx.module.matter.model.MatterEntity;
+import com.mortals.xhx.module.matter.model.*;
+import com.mortals.xhx.module.matter.service.MatterDatumFileService;
 import com.mortals.xhx.module.matter.service.MatterDatumService;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.site.model.SiteDatumLibraryQuery;
@@ -41,6 +41,28 @@ public class SiteDatumLibraryServiceImpl extends AbstractCRUDServiceImpl<SiteDat
     @Autowired
     private MatterDatumService matterDatumService;
 
+    @Autowired
+    private MatterDatumFileService matterDatumFileService;
+
+    @Override
+    protected void findAfter(SiteDatumLibraryEntity params, Context context, List<SiteDatumLibraryEntity> list) throws AppException {
+
+        list.stream().peek(item->{
+            List<MatterDatumFileEntity> matterDatumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(item.getId()));
+            item.setDatumFileList(matterDatumFileEntities);
+        }).count();
+        super.findAfter(params, context, list);
+    }
+
+    @Override
+    protected void findAfter(SiteDatumLibraryEntity params, PageInfo pageInfo, Context context, List<SiteDatumLibraryEntity> list) throws AppException {
+        list.stream().peek(item->{
+            List<MatterDatumFileEntity> matterDatumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(item.getId()));
+            item.setDatumFileList(matterDatumFileEntities);
+        }).count();
+        super.findAfter(params, pageInfo,context, list);
+    }
+
     @Override
     public Rest<String> addToMatterDatum(String libraryIds, Long matterId, Context context) {
         if (ObjectUtils.isEmpty(matterId)) {

single-matter/src/main/resources/sqlmap/module/site/SiteMatterMapper.xml

@@ -22,6 +22,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
+        <result property="url" column="url" />
 
     </resultMap>
 
@@ -80,23 +81,26 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
                 a.updateTime,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
+                a.url,
+            </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="SiteMatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_sys_site_matter
-        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,createUserId,createTime,updateUserId,updateTime)
+        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,createUserId,createTime,updateUserId,updateTime,url)
         VALUES
-        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{source},#{eventTypeShow},#{viewsCount},#{isConvert},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
+        (#{siteId},#{siteName},#{matterId},#{matterName},#{matterCode},#{deptId},#{deptName},#{deptCode},#{source},#{eventTypeShow},#{viewsCount},#{isConvert},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{url})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_sys_site_matter
-        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,createUserId,createTime,updateUserId,updateTime)
+        (siteId,siteName,matterId,matterName,matterCode,deptId,deptName,deptCode,source,eventTypeShow,viewsCount,isConvert,createUserId,createTime,updateUserId,updateTime,url)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.source},#{item.eventTypeShow},#{item.viewsCount},#{item.isConvert},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
+            (#{item.siteId},#{item.siteName},#{item.matterId},#{item.matterName},#{item.matterCode},#{item.deptId},#{item.deptName},#{item.deptCode},#{item.source},#{item.eventTypeShow},#{item.viewsCount},#{item.isConvert},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.url})
         </foreach>
     </insert>
 
@@ -178,6 +182,9 @@
             <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
                 a.updateTime=#{data.updateTime},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
+                a.url=#{data.url},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -342,6 +349,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="url=(case" suffix="ELSE url end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
+                        when a.id=#{item.id} then #{item.url}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -857,6 +871,27 @@
         <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
             ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
         </if>
+
+        <if test="conditionParamRef.containsKey('url')">
+            <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
+                ${_conditionType_} a.url like #{${_conditionParam_}.url}
+            </if>
+            <if test="conditionParamRef.url == null">
+                ${_conditionType_} a.url is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('urlList')">
+            ${_conditionType_} a.url in
+            <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('urlNotList')">
+            ${_conditionType_} a.url not in
+            <foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -955,6 +990,11 @@
                     <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('url')">
+                    a.url
+                    <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
+                    ,
+                </if>
             </trim>
         </if>
     </sql>