增加事项来源字段

fill-manager/src/main/java/com/mortals/xhx/common/code/MatterSourceEnum.java

+package com.mortals.xhx.common.code;
+
+import com.mortals.framework.ap.SysConstains;
+import com.mortals.framework.common.IBaseEnum;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public enum MatterSourceEnum implements IBaseEnum {
+
+    MANUAL(0, "手动添加", SysConstains.STYLE_DEFAULT),
+    AUTO(1, "站点事项", SysConstains.STYLE_DEFAULT);
+
+    private int value;
+    private String desc;
+    private String style;
+
+    MatterSourceEnum(int value, String desc, String style) {
+        this.value = value;
+        this.desc = desc;
+        this.style = style;
+    }
+
+    @Override
+    public int getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public String getStyle()
+    {
+        return style;
+    }
+
+    public static MatterSourceEnum getByValue(int value) {
+        for (MatterSourceEnum e : MatterSourceEnum.values()) {
+            if (e.getValue() == value) {
+                return e;
+            }
+        }
+        return null;
+    }
+
+    public static Map<String,String> getEnumMap(int... eItem) {
+        Map<String,String> resultMap= new LinkedHashMap<String,String>();
+        for (MatterSourceEnum item : MatterSourceEnum.values()) {
+            try{
+                boolean hasE = false;
+                for (int e : eItem){
+                    if(item.getValue()==e){
+                        hasE = true;
+                        break;
+                    }
+                }
+                if(!hasE){
+                    resultMap.put(item.getValue()+"", item.getDesc());
+                }
+            }catch(Exception ex){
+            }
+        }
+        return resultMap;
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterVo;
 * 事项申请材料实体对象
 *
 * @author zxfei
-* @date 2022-09-27
+* @date 2022-10-10
 */
 
 public class MatterEntity extends MatterVo {
@@ -64,6 +64,10 @@ public class MatterEntity extends MatterVo {
     * 是否推荐(0.未推荐，1.推荐)
     */
     private Integer isRecommend;
+    /**
+    * 事项来源(0.手动添加，1.站点事项)
+    */
+    private Integer source;
 
 
 
@@ -236,6 +240,20 @@ public class MatterEntity extends MatterVo {
     public void setIsRecommend(Integer isRecommend){
         this.isRecommend = isRecommend;
     }
+    /**
+    * 获取 事项来源(0.手动添加，1.站点事项)
+    * @return Integer
+    */
+    public Integer getSource(){
+        return source;
+    }
+    /**
+    * 设置 事项来源(0.手动添加，1.站点事项)
+    * @param source
+    */
+    public void setSource(Integer source){
+        this.source = source;
+    }
 
 
 
@@ -270,6 +288,7 @@ public class MatterEntity extends MatterVo {
         sb.append(",total:").append(getTotal());
         sb.append(",sort:").append(getSort());
         sb.append(",isRecommend:").append(getIsRecommend());
+        sb.append(",source:").append(getSource());
         return sb.toString();
     }
 
@@ -298,5 +317,7 @@ public class MatterEntity extends MatterVo {
             this.sort = null;
 
             this.isRecommend = 0;
+
+            this.source = 0;
     }
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
 * 事项申请材料查询对象
 *
 * @author zxfei
-* @date 2022-09-27
+* @date 2022-10-10
 */
 public class MatterQuery extends MatterEntity {
     /** 开始 主键，自增长 */
@@ -102,6 +102,18 @@ public class MatterQuery extends MatterEntity {
     /** 是否推荐(0.未推荐，1.推荐)列表 */
     private List <Integer> isRecommendList;
 
+    /** 开始 事项来源(0.手动添加，1.站点事项) */
+    private Integer sourceStart;
+
+    /** 结束 事项来源(0.手动添加，1.站点事项) */
+    private Integer sourceEnd;
+
+    /** 增加 事项来源(0.手动添加，1.站点事项) */
+    private Integer sourceIncrement;
+
+    /** 事项来源(0.手动添加，1.站点事项)列表 */
+    private List <Integer> sourceList;
+
     /** 开始 创建时间 */
     private String createTimeStart;
 
@@ -623,6 +635,70 @@ public class MatterQuery extends MatterEntity {
         this.isRecommendList = isRecommendList;
     }
 
+    /**
+    * 获取 开始 事项来源(0.手动添加，1.站点事项)
+    * @return sourceStart
+    */
+    public Integer getSourceStart(){
+        return this.sourceStart;
+    }
+
+    /**
+    * 设置 开始 事项来源(0.手动添加，1.站点事项)
+    * @param sourceStart
+    */
+    public void setSourceStart(Integer sourceStart){
+        this.sourceStart = sourceStart;
+    }
+
+    /**
+    * 获取 结束 事项来源(0.手动添加，1.站点事项)
+    * @return $sourceEnd
+    */
+    public Integer getSourceEnd(){
+        return this.sourceEnd;
+    }
+
+    /**
+    * 设置 结束 事项来源(0.手动添加，1.站点事项)
+    * @param sourceEnd
+    */
+    public void setSourceEnd(Integer sourceEnd){
+        this.sourceEnd = sourceEnd;
+    }
+
+    /**
+    * 获取 增加 事项来源(0.手动添加，1.站点事项)
+    * @return sourceIncrement
+    */
+    public Integer getSourceIncrement(){
+        return this.sourceIncrement;
+    }
+
+    /**
+    * 设置 增加 事项来源(0.手动添加，1.站点事项)
+    * @param sourceIncrement
+    */
+    public void setSourceIncrement(Integer sourceIncrement){
+        this.sourceIncrement = sourceIncrement;
+    }
+
+    /**
+    * 获取 事项来源(0.手动添加，1.站点事项)
+    * @return sourceList
+    */
+    public List<Integer> getSourceList(){
+        return this.sourceList;
+    }
+
+    /**
+    * 设置 事项来源(0.手动添加，1.站点事项)
+    * @param sourceList
+    */
+    public void setSourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+    }
+
     /**
     * 获取 开始 创建时间
     * @return createTimeStart
@@ -1154,6 +1230,51 @@ public class MatterQuery extends MatterEntity {
 		return this;
         }
 
+    /**
+    * 设置  事项来源(0.手动添加，1.站点事项)
+    * @param source
+    */
+    public MatterQuery source(Integer source){
+	    setSource(source);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 事项来源(0.手动添加，1.站点事项)
+    * @param sourceStart
+    */
+    public MatterQuery sourceStart(Integer sourceStart){
+		this.sourceStart = sourceStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 事项来源(0.手动添加，1.站点事项)
+    * @param sourceEnd
+    */
+    public MatterQuery sourceEnd(Integer sourceEnd){
+		this.sourceEnd = sourceEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 事项来源(0.手动添加，1.站点事项)
+    * @param sourceIncrement
+    */
+    public MatterQuery sourceIncrement(Integer sourceIncrement){
+		this.sourceIncrement = sourceIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 事项来源(0.手动添加，1.站点事项)
+    * @param sourceList
+    */
+    public MatterQuery sourceList(List<Integer> sourceList){
+        this.sourceList = sourceList;
+		return this;
+        }
+
 
     /**
     * 设置  创建用户

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

 package com.mortals.xhx.module.matter.service.impl;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.MatterSourceEnum;
 import com.mortals.xhx.common.key.ParamKey;
 import com.mortals.xhx.common.utils.StringUtils;
 import com.mortals.xhx.module.sheet.dao.SheetMatterDao;
@@ -40,6 +41,15 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
         return params;
     }
 
+    @Override
+    protected void saveBefore(MatterEntity entity, Context context) throws AppException {
+        entity.setTotal(0);
+        entity.setSort(0);
+        entity.setIsRecommend(0);
+        entity.setSource(MatterSourceEnum.MANUAL.getValue());
+        this.validData(entity, context);
+    }
+
     @Override
     public void createMatterbBySheetMatter(Long[] sheetMatterIds) {
         List<SheetMatterEntity> sheetMatterEntityList = sheetMatterDao.get(sheetMatterIds);
@@ -67,6 +77,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
                 matterEntity.setTotal(0);
                 matterEntity.setSort(0);
                 matterEntity.setIsRecommend(0);
+                matterEntity.setSource(MatterSourceEnum.AUTO.getValue());
                 matterEntity.setCreateUserId(1l);
                 matterEntity.setCreateTime(now);
                 list.add(matterEntity);

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

 package com.mortals.xhx.module.matter.web;
+import com.mortals.framework.common.IBaseEnum;
 import com.mortals.framework.common.code.YesNo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.MatterSourceEnum;
 import com.mortals.xhx.common.key.ParamKey;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -48,6 +50,7 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "isRecommend", paramService.getParamBySecondOrganize("Matter","isRecommend"));
+        this.addDict(model, "source", IBaseEnum.getEnumMap(MatterSourceEnum.class));
         super.init(model, context);
     }
 

fill-manager/src/main/resources/sqlmap/module/matter/MatterMapper.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.MatterDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -18,6 +18,7 @@
         <result property="total" column="total" />
         <result property="sort" column="sort" />
         <result property="isRecommend" column="isRecommend" />
+        <result property="source" column="source" />
         <result property="createTime" column="createTime" />
         <result property="createUserId" column="createUserId" />
         <result property="updateTime" column="updateTime" />
@@ -67,6 +68,9 @@
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isRecommend') or colPickMode == 1 and data.containsKey('isRecommend')))">
                 a.isRecommend,
             </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
+                a.source,
+            </if>
             <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
                 a.createTime,
             </if>
@@ -81,18 +85,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="MatterEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,matterFullName,deptId,total,sort,isRecommend,createTime,createUserId,updateTime)
+        (siteId,tid,tcode,tname,matterName,englishName,matterNo,matterFullName,deptId,total,sort,isRecommend,source,createTime,createUserId,updateTime)
         VALUES
-        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{matterFullName},#{deptId},#{total},#{sort},#{isRecommend},#{createTime},#{createUserId},#{updateTime})
+        (#{siteId},#{tid},#{tcode},#{tname},#{matterName},#{englishName},#{matterNo},#{matterFullName},#{deptId},#{total},#{sort},#{isRecommend},#{source},#{createTime},#{createUserId},#{updateTime})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_matter
-        (siteId,tid,tcode,tname,matterName,englishName,matterNo,matterFullName,deptId,total,sort,isRecommend,createTime,createUserId,updateTime)
+        (siteId,tid,tcode,tname,matterName,englishName,matterNo,matterFullName,deptId,total,sort,isRecommend,source,createTime,createUserId,updateTime)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.matterFullName},#{item.deptId},#{item.total},#{item.sort},#{item.isRecommend},#{item.createTime},#{item.createUserId},#{item.updateTime})
+            (#{item.siteId},#{item.tid},#{item.tcode},#{item.tname},#{item.matterName},#{item.englishName},#{item.matterNo},#{item.matterFullName},#{item.deptId},#{item.total},#{item.sort},#{item.isRecommend},#{item.source},#{item.createTime},#{item.createUserId},#{item.updateTime})
         </foreach>
     </insert>
 
@@ -153,6 +157,12 @@
             <if test="(colPickMode==0 and data.containsKey('isRecommendIncrement')) or (colPickMode==1 and !data.containsKey('isRecommendIncrement'))">
                 a.isRecommend=ifnull(a.isRecommend,0) + #{data.isRecommendIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
+                a.source=#{data.source},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
+                a.source=ifnull(a.source,0) + #{data.sourceIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
                 a.createTime=#{data.createTime},
             </if>
@@ -286,6 +296,18 @@
                     </choose>
                 </foreach>
             </trim>
+            <trim prefix="source=(case" suffix="ELSE source end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
+                            when a.id=#{item.id} then #{item.source}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
             <trim prefix="createTime=(case" suffix="ELSE createTime end),">
                 <foreach collection="data.dataList" item="item" index="index" separator="" >
                     <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
@@ -644,6 +666,27 @@
             ${_conditionType_} a.isRecommend <![CDATA[ <= ]]> #{${_conditionParam_}.isRecommendEnd}
         </if>
 
+        <if test="conditionParamRef.containsKey('source')">
+            <if test="conditionParamRef.source != null ">
+                ${_conditionType_} a.source = #{${_conditionParam_}.source}
+            </if>
+            <if test="conditionParamRef.source == null">
+                ${_conditionType_} a.source is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('sourceList')">
+            ${_conditionType_} a.source in
+            <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
+            ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
+        </if>
+        <if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
+            ${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
+        </if>
+
 
         <if test="conditionParamRef.containsKey('createTime')">
             <if test="conditionParamRef.createTime != null ">
@@ -773,6 +816,11 @@
                     <if test='orderCol.isRecommend != null and "DESC".equalsIgnoreCase(orderCol.isRecommend)'>DESC</if>
                     ,
                 </if>
+                <if test="orderCol.containsKey('source')">
+                    a.source
+                    <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
+                    ,
+                </if>
                 <if test="orderCol.containsKey('createTime')">
                     a.createTime
                     <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>