Skip to content

F
fill-system
Commit 779a8a90 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改热门词汇

parent 7807ac81
Pipeline #2398 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 3543 additions and 892 deletions
      fill-manager/db/module.sql
      View file @ 779a8a90
      ......@@ -85,31 +85,37 @@ PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='基础事项业务';
      -- ----------------------------
      -- 事项申请材料业务表
      -- 事项申请材料表
      -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_matter`;
      CREATE TABLE mortals_xhx_matter(
      DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
      CREATE TABLE mortals_xhx_matter_datum(
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `siteId` bigint(20) COMMENT '站点ID',
      `tid` varchar(128) COMMENT '从政务系统来的事项id',
      `tcode` varchar(128) COMMENT '从政务系统来的事项code',
      `tname` varchar(255) COMMENT '从政务系统来的事项name',
      `matterName` varchar(255) COMMENT '事项名称',
      `englishName` varchar(256) COMMENT '英语事项名',
      `matterNo` varchar(255) COMMENT '事项编号',
      `matterFullName` varchar(255) COMMENT '事项全称',
      `siteId` bigint(20) COMMENT '站点id',
      `matterId` bigint(20) COMMENT '事项matter id',
      `deptId` bigint(20) COMMENT '部门ID',
      `deptCode` varchar(256) COMMENT '部门编号',
      `deptName` varchar(64) COMMENT '部门名称',
      `deptCode` varchar(255) COMMENT '部门编码',
      `deptName` varchar(255) COMMENT '部门名称',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
      `source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
      `isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
      `total` int(8) COMMENT '填单次数',
      `sort` int(4) COMMENT '排序',
      `isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
      `source` tinyint(2) COMMENT '事项来源(0.手动添加，1.站点事项)',
      `samplePrint` int(9) COMMENT '样表打印次数',
      `fileName` varchar(255) COMMENT '填单的附件名称',
      `fileUrl` varchar(255) COMMENT '填单的附件下载地址',
      `sampleName` varchar(255) COMMENT '样表名称',
      `samplePath` varchar(255) COMMENT '样表地址',
      `templateName` varchar(255) COMMENT '模板名称',
      `templatePath` varchar(255) COMMENT '模板地址',
      `preViewPath` varchar(255) COMMENT '样表预览地址',
      `formContent` mediumtext COMMENT '表单内容',
      `createTime` datetime COMMENT '创建时间',
      `createUserId` bigint(20) COMMENT '创建用户',
      `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料';
      -- ----------------------------
      -- 事项材料公共库表
      ......@@ -151,12 +157,16 @@ CREATE TABLE mortals_xhx_hotword(
      `hotwords` varchar(512) COMMENT '热门词汇',
      `printDisplay` int(4) COMMENT '空白打印材料展示数量',
      `newsSource` tinyint(4) COMMENT '新闻来源(1.热点新闻,2.本地要闻,3.政策发布,4.通知公告)',
      `searchCount` int(9) COMMENT '查询次数',
      `wordsSource` tinyint(4) COMMENT '热门词汇来源（1.手动添加,2.查询添加）',
      `createTime` datetime COMMENT '创建时间',
      `createUserId` bigint(20) COMMENT '创建用户',
      `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='热门词汇业务';
      -- ----------------------------
      -- 事项申请材料业务表
      -- ----------------------------
      ......@@ -188,6 +198,25 @@ CREATE TABLE mortals_xhx_matter_datum(
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
      -- ----------------------------
      -- 打印提交表
      -- ----------------------------
      DROP TABLE IF EXISTS `mortals_fill_matter_datum_print`;
      CREATE TABLE mortals_fill_matter_datum_print(
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `orderId` varchar(64) COMMENT '打印订单',
      `materialId` bigint(20) COMMENT '材料Id',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `page` int(8) COMMENT '材料页数',
      `type` tinyint(2) COMMENT '打印类型(1.本地打印,2.在线打印)',
      `docPath` varchar(255) COMMENT '合成doc后地址',
      `formContent` mediumtext COMMENT '提交的表单',
      `createTime` datetime COMMENT '创建时间',
      `createUserId` bigint(20) COMMENT '创建用户',
      `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='打印提交';
      ......
      fill-manager/src/main/java/com/mortals/xhx/common/code/TypeEnum.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.common.code;
      import java.util.LinkedHashMap;
      import java.util.Map;
      /**
      * 打印类型(1.本地打印,2.在线打印)枚举类
      *
      * @author zxfei
      */
      public enum TypeEnum {
      本地打印(1, "本地打印"),
      在线打印(2, "在线打印");
      private Integer value;
      private String desc;
      TypeEnum(Integer value, String desc) {
      this.value = value;
      this.desc = desc;
      }
      public Integer getValue() {
      return this.value;
      }
      public String getDesc() {
      return this.desc;
      }
      public static TypeEnum getByValue(Integer value) {
      for (TypeEnum typeEnum : TypeEnum.values()) {
      if (typeEnum.getValue() == value) {
      return typeEnum;
      }
      }
      return null;
      }
      /**
      * 获取Map集合
      *
      * @param eItem 不包含项
      * @return
      */
      public static Map<String, String> getEnumMap(Integer... eItem) {
      Map<String, String> resultMap = new LinkedHashMap<>();
      for (TypeEnum item : TypeEnum.values()) {
      try {
      boolean hasE = false;
      for (Integer e : eItem) {
      if (item.getValue() == e) {
      hasE = true;
      break;
      }
      }
      if (!hasE) {
      resultMap.put(item.getValue() + "", item.getDesc());
      }
      } catch (Exception ex) {
      }
      }
      return resultMap;
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/common/utils/MemoryPagination.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.common.utils;
      import org.apache.commons.collections4.CollectionUtils;
      import java.util.Collections;
      import java.util.List;
      import java.util.Set;
      import java.util.concurrent.ConcurrentHashMap;
      import java.util.function.Function;
      import java.util.function.Predicate;
      import java.util.stream.Collectors;
      /**
      * @author: zxfei
      * @date: 2022/6/28 14:38
      * @description: 内存分页
      **/
      public class MemoryPagination {
      /**
      * 内存分页
      *
      * @param records 待分页的数据
      * @param pageNum 当前页码
      * @param pageSize 每页显示的条数
      * @return 分页之后的数据
      */
      public static <T> List<T> pagination(List<T> records, int pageNum, int pageSize) {
      if (CollectionUtils.isEmpty(records)) {
      return Collections.emptyList();
      }
      int totalCount = records.size();
      int remainder = totalCount % pageSize;
      int pageCount = (remainder > 0) ? totalCount / pageSize + 1 : totalCount / pageSize;
      if (remainder == 0) {
      return records.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
      } else {
      if (pageNum == pageCount) {
      return records.stream().skip((pageNum - 1) * pageSize).limit(totalCount).collect(Collectors.toList());
      } else {
      return records.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
      }
      }
      }
      public static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
      Set<Object> seen = ConcurrentHashMap.newKeySet();
      return t -> seen.add(keyExtractor.apply(t));
      }
      }
      fill-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java
      View file @ 779a8a90
      ......@@ -8,6 +8,10 @@ import com.mortals.framework.annotation.UnAuth;
      import com.mortals.framework.ap.GlobalSysInfo;
      import com.mortals.framework.common.Rest;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context;
      import com.mortals.framework.model.OrderCol;
      import com.mortals.framework.model.PageInfo;
      import com.mortals.framework.model.Result;
      import com.mortals.framework.service.IUser;
      import com.mortals.framework.util.DataUtil;
      import com.mortals.framework.util.HttpUtil;
      ......@@ -17,6 +21,7 @@ import com.mortals.xhx.base.system.param.service.ParamService;
      import com.mortals.xhx.common.code.NewsSourceEnum;
      import com.mortals.xhx.common.code.YesNoEnum;
      import com.mortals.xhx.common.key.Constant;
      import com.mortals.xhx.common.utils.MemoryPagination;
      import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
      import com.mortals.xhx.feign.base.pdu.DeptPdu;
      import com.mortals.xhx.feign.base.pdu.SitePdu;
      ......@@ -33,13 +38,18 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
      import com.mortals.xhx.module.matter.model.MatterQuery;
      import com.mortals.xhx.module.matter.service.MatterDatumService;
      import com.mortals.xhx.module.matter.service.MatterService;
      import org.apache.poi.ss.formula.functions.T;
      import org.checkerframework.checker.units.qual.A;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.util.ObjectUtils;
      import org.springframework.web.bind.annotation.*;
      import java.util.*;
      import java.util.stream.Collectors;
      import static com.mortals.framework.ap.SysConstains.MESSAGE_INFO;
      import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
      @RestController
      @RequestMapping("home")
      public class HomeController extends BaseJsonBodyController {
      ......@@ -106,10 +116,6 @@ public class HomeController extends BaseJsonBodyController {
      @PostMapping({"dept/list"})
      @UnAuth
      public Rest<Object> deptList(@RequestBody HomeQueryPdu queryPdu) {
      // IUser user = this.getCurUser();
      // if(user==null){
      // throw new AppException("用户未登录");
      // }
      Rest<Object> ret = new Rest();
      Map<String, Object> model = new HashMap();
      String busiDesc = "查询站点部门列表";
      ......@@ -146,8 +152,6 @@ public class HomeController extends BaseJsonBodyController {
      return ret;
      }
      @PostMapping({"notice/list"})
      @UnAuth
      public String noteList(@RequestBody HomeQueryPdu queryPdu) {
      ......@@ -160,10 +164,10 @@ public class HomeController extends BaseJsonBodyController {
      int code = VALUE_RESULT_SUCCESS;
      try {
      Map<String, String> params = new HashMap<>();
      params.put("siteid",queryPdu.getSiteId().toString());
      params.put("type",queryPdu.getType().toString());
      params.put("page",queryPdu.getPage().toString());
      params.put("size",queryPdu.getSize().toString());
      params.put("siteid", queryPdu.getSiteId().toString());
      params.put("type", queryPdu.getType().toString());
      params.put("page", queryPdu.getPage().toString());
      params.put("size", queryPdu.getSize().toString());
      UrlBuilder urlBuilder = domain.addPath("news").addPath("newsList");
      String response = HttpUtil.doGet(urlBuilder.toString(), params);
      this.recordSysLog(this.request, busiDesc + " 【成功】");
      ......@@ -181,7 +185,6 @@ public class HomeController extends BaseJsonBodyController {
      @GetMapping({"notice/info"})
      @UnAuth
      public String noteInfo(Long id) {
      String url = GlobalSysInfo.getParamValue(Constant.PARAMS_NOTICE_URL, "http://192.168.0.98:8090/api/");
      UrlBuilder domain = UrlBuilder.of(url);
      Rest<Object> ret = new Rest();
      ......@@ -190,7 +193,7 @@ public class HomeController extends BaseJsonBodyController {
      int code = VALUE_RESULT_SUCCESS;
      try {
      Map<String, String> params = new HashMap<>();
      params.put("id",id.toString());
      params.put("id", id.toString());
      UrlBuilder urlBuilder = domain.addPath("news").addPath("newInfo");
      String response = HttpUtil.doGet(urlBuilder.toString(), params);
      this.recordSysLog(this.request, busiDesc + " 【成功】");
      ......@@ -215,11 +218,11 @@ public class HomeController extends BaseJsonBodyController {
      try {
      String paths = matterDatumService.mergeFormToDoc(docFormVo, getContext());
      String[] vals = paths.split(";");
      if(vals.length>1){
      if (vals.length > 1) {
      jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
      jsonObject.put("mergeDoc", vals[0]);
      jsonObject.put("preview", vals[1]);
      }else{
      } else {
      throw new AppException("合成表单异常！");
      }
      ......@@ -245,7 +248,16 @@ public class HomeController extends BaseJsonBodyController {
      String busiDesc = "获取首页数据";
      int code = VALUE_RESULT_SUCCESS;
      try {
      List<String> hotwordEntities = hotwordService.find(new HotwordQuery().siteId(homeQueryPdu.getSiteId())).stream()
      HotwordQuery hotwordQuery = new HotwordQuery();
      hotwordQuery.siteId(homeQueryPdu.getSiteId());
      List<OrderCol> orderColList = new ArrayList<>();
      orderColList.add(new OrderCol("searchCount", OrderCol.DESCENDING));
      orderColList.add(new OrderCol("wordsSource", OrderCol.ASCENDING));
      hotwordQuery.setOrderColList(orderColList);
      List<String> hotwordEntities = hotwordService.find(hotwordQuery, new PageInfo(), null).getList().stream()
      .map(HotwordEntity::getHotwords)
      .flatMap(item -> StrUtil.split(item, ",".charAt(0)).stream())
      .collect(Collectors.toList());
      ......@@ -267,15 +279,15 @@ public class HomeController extends BaseJsonBodyController {
      model.put("datumCont", datumCont); //入驻表单数量
      model.put("localPrint", 20); //本地打印数量
      model.put("onlineSubmit", 20); //在线提交数量
      model.put("onlineSubmit", 0); //在线提交数量
      model.put("dayThrift", 66); //今日节约
      model.put("totalThrift", 996); //累计节约
      Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
      model.put("title", info==null?"":info.getData().getSiteName()); //标题
      model.put("title", info == null ? "" : info.getData().getSiteName()); //标题
      HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(homeQueryPdu.getSiteId()));
      model.put("blankCount", hotwordEntity==null?20:hotwordEntity.getPrintDisplay()); //空白样表数量
      model.put("newsSource", hotwordEntity==null?1:hotwordEntity.getNewsSource()); //新闻来源
      HotwordEntity hotwordEntity = hotwordService.selectOne(hotwordQuery.siteId(homeQueryPdu.getSiteId()));
      model.put("blankCount", hotwordEntity == null ? 20 : hotwordEntity.getPrintDisplay()); //空白样表数量
      model.put("newsSource", hotwordEntity == null ? 1 : hotwordEntity.getNewsSource()); //新闻来源
      model.put("message_info", busiDesc + "成功");
      this.addDict(model, "newsSource", NewsSourceEnum.getEnumMap());
      this.recordSysLog(this.request, busiDesc + " 【成功】");
      ......@@ -290,4 +302,6 @@ public class HomeController extends BaseJsonBodyController {
      ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
      return ret;
      }
      }
      fill-manager/src/main/java/com/mortals/xhx/module/hotword/model/HotwordEntity.java
      View file @ 779a8a90
      package com.mortals.xhx.module.hotword.model;
      import java.util.List;
      import java.util.ArrayList;
      import com.fasterxml.jackson.annotation.JsonFormat;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.hotword.model.vo.HotwordVo;
      /**
      * 热门词汇业务实体对象
      *
      * @author zxfei
      * @date 2022-12-06
      */
      * 热门词汇业务实体对象
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public class HotwordEntity extends HotwordVo {
      private static final long serialVersionUID = 1L;
      ......@@ -32,6 +27,14 @@ public class HotwordEntity extends HotwordVo {
      * 新闻来源(1.热点新闻,2.本地要闻,3.政策发布,4.通知公告)
      */
      private Integer newsSource;
      /**
      * 查询次数
      */
      private Integer searchCount;
      /**
      * 热门词汇来源（1.手动添加,2.查询添加）
      */
      private Integer wordsSource;
      ......@@ -92,6 +95,34 @@ public class HotwordEntity extends HotwordVo {
      public void setNewsSource(Integer newsSource){
      this.newsSource = newsSource;
      }
      /**
      * 获取 查询次数
      * @return Integer
      */
      public Integer getSearchCount(){
      return searchCount;
      }
      /**
      * 设置 查询次数
      * @param searchCount
      */
      public void setSearchCount(Integer searchCount){
      this.searchCount = searchCount;
      }
      /**
      * 获取 热门词汇来源（1.手动添加,2.查询添加）
      * @return Integer
      */
      public Integer getWordsSource(){
      return wordsSource;
      }
      /**
      * 设置 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSource
      */
      public void setWordsSource(Integer wordsSource){
      this.wordsSource = wordsSource;
      }
      ......@@ -118,6 +149,8 @@ public class HotwordEntity extends HotwordVo {
      sb.append(",hotwords:").append(getHotwords());
      sb.append(",printDisplay:").append(getPrintDisplay());
      sb.append(",newsSource:").append(getNewsSource());
      sb.append(",searchCount:").append(getSearchCount());
      sb.append(",wordsSource:").append(getWordsSource());
      return sb.toString();
      }
      ......@@ -125,10 +158,14 @@ public class HotwordEntity extends HotwordVo {
      this.siteId = null;
      this.hotwords = null;
      this.hotwords = "";
      this.printDisplay = 0;
      this.newsSource = 1;
      this.printDisplay = null;
      this.searchCount = 0;
      this.newsSource = null;
      this.wordsSource = 1;
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/hotword/model/HotwordQuery.java
      View file @ 779a8a90
      ......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.hotword.model;
      import java.util.List;
      import com.mortals.xhx.module.hotword.model.HotwordEntity;
      /**
      * 热门词汇业务查询对象
      *
      * @author zxfei
      * @date 2022-12-06
      */
      * 热门词汇业务查询对象
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public class HotwordQuery extends HotwordEntity {
      /** 开始 主键，自增长 */
      private Long idStart;
      ......@@ -60,6 +60,30 @@ public class HotwordQuery extends HotwordEntity {
      /** 新闻来源(1.热点新闻,2.本地要闻,3.政策发布,4.通知公告)列表 */
      private List <Integer> newsSourceList;
      /** 开始 查询次数 */
      private Integer searchCountStart;
      /** 结束 查询次数 */
      private Integer searchCountEnd;
      /** 增加 查询次数 */
      private Integer searchCountIncrement;
      /** 查询次数列表 */
      private List <Integer> searchCountList;
      /** 开始 热门词汇来源（1.手动添加,2.查询添加） */
      private Integer wordsSourceStart;
      /** 结束 热门词汇来源（1.手动添加,2.查询添加） */
      private Integer wordsSourceEnd;
      /** 增加 热门词汇来源（1.手动添加,2.查询添加） */
      private Integer wordsSourceIncrement;
      /** 热门词汇来源（1.手动添加,2.查询添加）列表 */
      private List <Integer> wordsSourceList;
      /** 开始 创建时间 */
      private String createTimeStart;
      ......@@ -363,6 +387,134 @@ public class HotwordQuery extends HotwordEntity {
      this.newsSourceList = newsSourceList;
      }
      /**
      * 获取 开始 查询次数
      * @return searchCountStart
      */
      public Integer getSearchCountStart(){
      return this.searchCountStart;
      }
      /**
      * 设置 开始 查询次数
      * @param searchCountStart
      */
      public void setSearchCountStart(Integer searchCountStart){
      this.searchCountStart = searchCountStart;
      }
      /**
      * 获取 结束 查询次数
      * @return $searchCountEnd
      */
      public Integer getSearchCountEnd(){
      return this.searchCountEnd;
      }
      /**
      * 设置 结束 查询次数
      * @param searchCountEnd
      */
      public void setSearchCountEnd(Integer searchCountEnd){
      this.searchCountEnd = searchCountEnd;
      }
      /**
      * 获取 增加 查询次数
      * @return searchCountIncrement
      */
      public Integer getSearchCountIncrement(){
      return this.searchCountIncrement;
      }
      /**
      * 设置 增加 查询次数
      * @param searchCountIncrement
      */
      public void setSearchCountIncrement(Integer searchCountIncrement){
      this.searchCountIncrement = searchCountIncrement;
      }
      /**
      * 获取 查询次数
      * @return searchCountList
      */
      public List<Integer> getSearchCountList(){
      return this.searchCountList;
      }
      /**
      * 设置 查询次数
      * @param searchCountList
      */
      public void setSearchCountList(List<Integer> searchCountList){
      this.searchCountList = searchCountList;
      }
      /**
      * 获取 开始 热门词汇来源（1.手动添加,2.查询添加）
      * @return wordsSourceStart
      */
      public Integer getWordsSourceStart(){
      return this.wordsSourceStart;
      }
      /**
      * 设置 开始 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceStart
      */
      public void setWordsSourceStart(Integer wordsSourceStart){
      this.wordsSourceStart = wordsSourceStart;
      }
      /**
      * 获取 结束 热门词汇来源（1.手动添加,2.查询添加）
      * @return $wordsSourceEnd
      */
      public Integer getWordsSourceEnd(){
      return this.wordsSourceEnd;
      }
      /**
      * 设置 结束 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceEnd
      */
      public void setWordsSourceEnd(Integer wordsSourceEnd){
      this.wordsSourceEnd = wordsSourceEnd;
      }
      /**
      * 获取 增加 热门词汇来源（1.手动添加,2.查询添加）
      * @return wordsSourceIncrement
      */
      public Integer getWordsSourceIncrement(){
      return this.wordsSourceIncrement;
      }
      /**
      * 设置 增加 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceIncrement
      */
      public void setWordsSourceIncrement(Integer wordsSourceIncrement){
      this.wordsSourceIncrement = wordsSourceIncrement;
      }
      /**
      * 获取 热门词汇来源（1.手动添加,2.查询添加）
      * @return wordsSourceList
      */
      public List<Integer> getWordsSourceList(){
      return this.wordsSourceList;
      }
      /**
      * 设置 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceList
      */
      public void setWordsSourceList(List<Integer> wordsSourceList){
      this.wordsSourceList = wordsSourceList;
      }
      /**
      * 获取 开始 创建时间
      * @return createTimeStart
      ......@@ -690,6 +842,96 @@ public class HotwordQuery extends HotwordEntity {
      return this;
      }
      /**
      * 设置 查询次数
      * @param searchCount
      */
      public HotwordQuery searchCount(Integer searchCount){
      setSearchCount(searchCount);
      return this;
      }
      /**
      * 设置 开始 查询次数
      * @param searchCountStart
      */
      public HotwordQuery searchCountStart(Integer searchCountStart){
      this.searchCountStart = searchCountStart;
      return this;
      }
      /**
      * 设置 结束 查询次数
      * @param searchCountEnd
      */
      public HotwordQuery searchCountEnd(Integer searchCountEnd){
      this.searchCountEnd = searchCountEnd;
      return this;
      }
      /**
      * 设置 增加 查询次数
      * @param searchCountIncrement
      */
      public HotwordQuery searchCountIncrement(Integer searchCountIncrement){
      this.searchCountIncrement = searchCountIncrement;
      return this;
      }
      /**
      * 设置 查询次数
      * @param searchCountList
      */
      public HotwordQuery searchCountList(List<Integer> searchCountList){
      this.searchCountList = searchCountList;
      return this;
      }
      /**
      * 设置 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSource
      */
      public HotwordQuery wordsSource(Integer wordsSource){
      setWordsSource(wordsSource);
      return this;
      }
      /**
      * 设置 开始 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceStart
      */
      public HotwordQuery wordsSourceStart(Integer wordsSourceStart){
      this.wordsSourceStart = wordsSourceStart;
      return this;
      }
      /**
      * 设置 结束 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceEnd
      */
      public HotwordQuery wordsSourceEnd(Integer wordsSourceEnd){
      this.wordsSourceEnd = wordsSourceEnd;
      return this;
      }
      /**
      * 设置 增加 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceIncrement
      */
      public HotwordQuery wordsSourceIncrement(Integer wordsSourceIncrement){
      this.wordsSourceIncrement = wordsSourceIncrement;
      return this;
      }
      /**
      * 设置 热门词汇来源（1.手动添加,2.查询添加）
      * @param wordsSourceList
      */
      public HotwordQuery wordsSourceList(List<Integer> wordsSourceList){
      this.wordsSourceList = wordsSourceList;
      return this;
      }
      /**
      * 设置 创建用户
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java
      View file @ 779a8a90
      ......@@ -7,29 +7,29 @@ import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
      /**
      * 事项申请材料业务实体对象
      * 事项申请材料实体对象
      *
      * @author zxfei
      * @date 2022-11-18
      * @date 2022-12-07
      */
      public class MatterDatumEntity extends MatterDatumVo {
      private static final long serialVersionUID = 1L;
      /**
      * 事项matter id
      * 站点id
      */
      private Long matterId;
      private Long siteId;
      /**
      * 站点ID
      * 事项matter id
      */
      private Long siteId;
      private Long matterId;
      /**
      * 部门ID
      */
      private Long deptId;
      /**
      * 部门编号
      * 部门编码
      */
      private String deptCode;
      /**
      ......@@ -60,6 +60,10 @@ public class MatterDatumEntity extends MatterDatumVo {
      * 排序
      */
      private Integer sort;
      /**
      * 样表打印次数
      */
      private Integer samplePrint;
      /**
      * 填单的附件名称
      */
      ......@@ -97,32 +101,32 @@ public class MatterDatumEntity extends MatterDatumVo {
      public MatterDatumEntity(){}
      /**
      * 获取 事项matter id
      * 获取 站点id
      * @return Long
      */
      public Long getMatterId(){
      return matterId;
      public Long getSiteId(){
      return siteId;
      }
      /**
      * 设置 事项matter id
      * @param matterId
      * 设置 站点id
      * @param siteId
      */
      public void setMatterId(Long matterId){
      this.matterId = matterId;
      public void setSiteId(Long siteId){
      this.siteId = siteId;
      }
      /**
      * 获取 站点ID
      * 获取 事项matter id
      * @return Long
      */
      public Long getSiteId(){
      return siteId;
      public Long getMatterId(){
      return matterId;
      }
      /**
      * 设置 站点ID
      * @param siteId
      * 设置 事项matter id
      * @param matterId
      */
      public void setSiteId(Long siteId){
      this.siteId = siteId;
      public void setMatterId(Long matterId){
      this.matterId = matterId;
      }
      /**
      * 获取 部门ID
      ......@@ -139,14 +143,14 @@ public class MatterDatumEntity extends MatterDatumVo {
      this.deptId = deptId;
      }
      /**
      * 获取 部门编号
      * 获取 部门编码
      * @return String
      */
      public String getDeptCode(){
      return deptCode;
      }
      /**
      * 设置 部门编号
      * 设置 部门编码
      * @param deptCode
      */
      public void setDeptCode(String deptCode){
      ......@@ -250,6 +254,20 @@ public class MatterDatumEntity extends MatterDatumVo {
      public void setSort(Integer sort){
      this.sort = sort;
      }
      /**
      * 获取 样表打印次数
      * @return Integer
      */
      public Integer getSamplePrint(){
      return samplePrint;
      }
      /**
      * 设置 样表打印次数
      * @param samplePrint
      */
      public void setSamplePrint(Integer samplePrint){
      this.samplePrint = samplePrint;
      }
      /**
      * 获取 填单的附件名称
      * @return String
      ......@@ -384,8 +402,8 @@ public class MatterDatumEntity extends MatterDatumVo {
      public String toString(){
      StringBuilder sb = new StringBuilder("");
      sb.append(",matterId:").append(getMatterId());
      sb.append(",siteId:").append(getSiteId());
      sb.append(",matterId:").append(getMatterId());
      sb.append(",deptId:").append(getDeptId());
      sb.append(",deptCode:").append(getDeptCode());
      sb.append(",deptName:").append(getDeptName());
      ......@@ -395,6 +413,7 @@ public class MatterDatumEntity extends MatterDatumVo {
      sb.append(",isRecommend:").append(getIsRecommend());
      sb.append(",total:").append(getTotal());
      sb.append(",sort:").append(getSort());
      sb.append(",samplePrint:").append(getSamplePrint());
      sb.append(",fileName:").append(getFileName());
      sb.append(",fileUrl:").append(getFileUrl());
      sb.append(",sampleName:").append(getSampleName());
      ......@@ -408,10 +427,10 @@ public class MatterDatumEntity extends MatterDatumVo {
      public void initAttrValue(){
      this.matterId = null;
      this.siteId = null;
      this.matterId = null;
      this.deptId = null;
      this.deptCode = "";
      ......@@ -430,11 +449,13 @@ public class MatterDatumEntity extends MatterDatumVo {
      this.sort = 0;
      this.samplePrint = 0;
      this.fileName = "";
      this.fileUrl = "";
      this.sampleName = "";
      this.sampleName = null;
      this.samplePath = "";
      ......@@ -444,6 +465,6 @@ public class MatterDatumEntity extends MatterDatumVo {
      this.preViewPath = "";
      this.formContent = "";
      this.formContent = null;
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumQuery.java
      View file @ 779a8a90
      ......@@ -3,10 +3,10 @@ package com.mortals.xhx.module.matter.model;
      import java.util.List;
      import com.mortals.xhx.module.matter.model.MatterDatumEntity;
      /**
      * 事项申请材料业务查询对象
      * 事项申请材料查询对象
      *
      * @author zxfei
      * @date 2022-11-18
      * @date 2022-12-07
      */
      public class MatterDatumQuery extends MatterDatumEntity {
      /** 开始 主键，自增长 */
      ......@@ -21,6 +21,18 @@ public class MatterDatumQuery extends MatterDatumEntity {
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 开始 站点id */
      private Long siteIdStart;
      /** 结束 站点id */
      private Long siteIdEnd;
      /** 增加 站点id */
      private Long siteIdIncrement;
      /** 站点id列表 */
      private List <Long> siteIdList;
      /** 开始 事项matter id */
      private Long matterIdStart;
      ......@@ -33,18 +45,6 @@ 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;
      ......@@ -57,7 +57,7 @@ public class MatterDatumQuery extends MatterDatumEntity {
      /** 部门ID列表 */
      private List <Long> deptIdList;
      /** 部门编号 */
      /** 部门编码 */
      private List<String> deptCodeList;
      /** 部门名称 */
      ......@@ -117,6 +117,18 @@ public class MatterDatumQuery extends MatterDatumEntity {
      /** 排序列表 */
      private List <Integer> sortList;
      /** 开始 样表打印次数 */
      private Integer samplePrintStart;
      /** 结束 样表打印次数 */
      private Integer samplePrintEnd;
      /** 增加 样表打印次数 */
      private Integer samplePrintIncrement;
      /** 样表打印次数列表 */
      private List <Integer> samplePrintList;
      /** 填单的附件名称 */
      private List<String> fileNameList;
      ......@@ -238,131 +250,131 @@ public class MatterDatumQuery extends MatterDatumEntity {
      }
      /**
      * 获取 开始 事项matter id
      * @return matterIdStart
      * 获取 开始 站点id
      * @return siteIdStart
      */
      public Long getMatterIdStart(){
      return this.matterIdStart;
      public Long getSiteIdStart(){
      return this.siteIdStart;
      }
      /**
      * 设置 开始 事项matter id
      * @param matterIdStart
      * 设置 开始 站点id
      * @param siteIdStart
      */
      public void setMatterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      }
      /**
      * 获取 结束 事项matter id
      * @return $matterIdEnd
      * 获取 结束 站点id
      * @return $siteIdEnd
      */
      public Long getMatterIdEnd(){
      return this.matterIdEnd;
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      }
      /**
      * 设置 结束 事项matter id
      * @param matterIdEnd
      * 设置 结束 站点id
      * @param siteIdEnd
      */
      public void setMatterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      }
      /**
      * 获取 增加 事项matter id
      * @return matterIdIncrement
      * 获取 增加 站点id
      * @return siteIdIncrement
      */
      public Long getMatterIdIncrement(){
      return this.matterIdIncrement;
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      }
      /**
      * 设置 增加 事项matter id
      * @param matterIdIncrement
      * 设置 增加 站点id
      * @param siteIdIncrement
      */
      public void setMatterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      }
      /**
      * 获取 事项matter id
      * @return matterIdList
      * 获取 站点id
      * @return siteIdList
      */
      public List<Long> getMatterIdList(){
      return this.matterIdList;
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      }
      /**
      * 设置 事项matter id
      * @param matterIdList
      * 设置 站点id
      * @param siteIdList
      */
      public void setMatterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      }
      /**
      * 获取 开始 站点ID
      * @return siteIdStart
      * 获取 开始 事项matter id
      * @return matterIdStart
      */
      public Long getSiteIdStart(){
      return this.siteIdStart;
      public Long getMatterIdStart(){
      return this.matterIdStart;
      }
      /**
      * 设置 开始 站点ID
      * @param siteIdStart
      * 设置 开始 事项matter id
      * @param matterIdStart
      */
      public void setSiteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      public void setMatterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      }
      /**
      * 获取 结束 站点ID
      * @return $siteIdEnd
      * 获取 结束 事项matter id
      * @return $matterIdEnd
      */
      public Long getSiteIdEnd(){
      return this.siteIdEnd;
      public Long getMatterIdEnd(){
      return this.matterIdEnd;
      }
      /**
      * 设置 结束 站点ID
      * @param siteIdEnd
      * 设置 结束 事项matter id
      * @param matterIdEnd
      */
      public void setSiteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      public void setMatterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      }
      /**
      * 获取 增加 站点ID
      * @return siteIdIncrement
      * 获取 增加 事项matter id
      * @return matterIdIncrement
      */
      public Long getSiteIdIncrement(){
      return this.siteIdIncrement;
      public Long getMatterIdIncrement(){
      return this.matterIdIncrement;
      }
      /**
      * 设置 增加 站点ID
      * @param siteIdIncrement
      * 设置 增加 事项matter id
      * @param matterIdIncrement
      */
      public void setSiteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      public void setMatterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      }
      /**
      * 获取 站点ID
      * @return siteIdList
      * 获取 事项matter id
      * @return matterIdList
      */
      public List<Long> getSiteIdList(){
      return this.siteIdList;
      public List<Long> getMatterIdList(){
      return this.matterIdList;
      }
      /**
      * 设置 站点ID
      * @param siteIdList
      * 设置 事项matter id
      * @param matterIdList
      */
      public void setSiteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      public void setMatterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      }
      /**
      ......@@ -430,7 +442,7 @@ public class MatterDatumQuery extends MatterDatumEntity {
      }
      /**
      * 获取 部门编号
      * 获取 部门编码
      * @return deptCodeList
      */
      public List<String> getDeptCodeList(){
      ......@@ -438,7 +450,7 @@ public class MatterDatumQuery extends MatterDatumEntity {
      }
      /**
      * 设置 部门编号
      * 设置 部门编码
      * @param deptCodeList
      */
      public void setDeptCodeList(List<String> deptCodeList){
      ......@@ -745,6 +757,70 @@ public class MatterDatumQuery extends MatterDatumEntity {
      this.sortList = sortList;
      }
      /**
      * 获取 开始 样表打印次数
      * @return samplePrintStart
      */
      public Integer getSamplePrintStart(){
      return this.samplePrintStart;
      }
      /**
      * 设置 开始 样表打印次数
      * @param samplePrintStart
      */
      public void setSamplePrintStart(Integer samplePrintStart){
      this.samplePrintStart = samplePrintStart;
      }
      /**
      * 获取 结束 样表打印次数
      * @return $samplePrintEnd
      */
      public Integer getSamplePrintEnd(){
      return this.samplePrintEnd;
      }
      /**
      * 设置 结束 样表打印次数
      * @param samplePrintEnd
      */
      public void setSamplePrintEnd(Integer samplePrintEnd){
      this.samplePrintEnd = samplePrintEnd;
      }
      /**
      * 获取 增加 样表打印次数
      * @return samplePrintIncrement
      */
      public Integer getSamplePrintIncrement(){
      return this.samplePrintIncrement;
      }
      /**
      * 设置 增加 样表打印次数
      * @param samplePrintIncrement
      */
      public void setSamplePrintIncrement(Integer samplePrintIncrement){
      this.samplePrintIncrement = samplePrintIncrement;
      }
      /**
      * 获取 样表打印次数
      * @return samplePrintList
      */
      public List<Integer> getSamplePrintList(){
      return this.samplePrintList;
      }
      /**
      * 设置 样表打印次数
      * @param samplePrintList
      */
      public void setSamplePrintList(List<Integer> samplePrintList){
      this.samplePrintList = samplePrintList;
      }
      /**
      * 获取 填单的附件名称
      * @return fileNameList
      ......@@ -1039,92 +1115,92 @@ public class MatterDatumQuery extends MatterDatumEntity {
      }
      /**
      * 设置 事项matter id
      * @param matterId
      * 设置 站点id
      * @param siteId
      */
      public MatterDatumQuery matterId(Long matterId){
      setMatterId(matterId);
      public MatterDatumQuery siteId(Long siteId){
      setSiteId(siteId);
      return this;
      }
      /**
      * 设置 开始 事项matter id
      * @param matterIdStart
      * 设置 开始 站点id
      * @param siteIdStart
      */
      public MatterDatumQuery matterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      public MatterDatumQuery siteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      return this;
      }
      /**
      * 设置 结束 事项matter id
      * @param matterIdEnd
      * 设置 结束 站点id
      * @param siteIdEnd
      */
      public MatterDatumQuery matterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      public MatterDatumQuery siteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      return this;
      }
      /**
      * 设置 增加 事项matter id
      * @param matterIdIncrement
      * 设置 增加 站点id
      * @param siteIdIncrement
      */
      public MatterDatumQuery matterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      public MatterDatumQuery siteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      return this;
      }
      /**
      * 设置 事项matter id
      * @param matterIdList
      * 设置 站点id
      * @param siteIdList
      */
      public MatterDatumQuery matterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      public MatterDatumQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteId
      * 设置 事项matter id
      * @param matterId
      */
      public MatterDatumQuery siteId(Long siteId){
      setSiteId(siteId);
      public MatterDatumQuery matterId(Long matterId){
      setMatterId(matterId);
      return this;
      }
      /**
      * 设置 开始 站点ID
      * @param siteIdStart
      * 设置 开始 事项matter id
      * @param matterIdStart
      */
      public MatterDatumQuery siteIdStart(Long siteIdStart){
      this.siteIdStart = siteIdStart;
      public MatterDatumQuery matterIdStart(Long matterIdStart){
      this.matterIdStart = matterIdStart;
      return this;
      }
      /**
      * 设置 结束 站点ID
      * @param siteIdEnd
      * 设置 结束 事项matter id
      * @param matterIdEnd
      */
      public MatterDatumQuery siteIdEnd(Long siteIdEnd){
      this.siteIdEnd = siteIdEnd;
      public MatterDatumQuery matterIdEnd(Long matterIdEnd){
      this.matterIdEnd = matterIdEnd;
      return this;
      }
      /**
      * 设置 增加 站点ID
      * @param siteIdIncrement
      * 设置 增加 事项matter id
      * @param matterIdIncrement
      */
      public MatterDatumQuery siteIdIncrement(Long siteIdIncrement){
      this.siteIdIncrement = siteIdIncrement;
      public MatterDatumQuery matterIdIncrement(Long matterIdIncrement){
      this.matterIdIncrement = matterIdIncrement;
      return this;
      }
      /**
      * 设置 站点ID
      * @param siteIdList
      * 设置 事项matter id
      * @param matterIdList
      */
      public MatterDatumQuery siteIdList(List<Long> siteIdList){
      this.siteIdList = siteIdList;
      public MatterDatumQuery matterIdList(List<Long> matterIdList){
      this.matterIdList = matterIdList;
      return this;
      }
      ......@@ -1175,7 +1251,7 @@ public class MatterDatumQuery extends MatterDatumEntity {
      /**
      * 设置 部门编号
      * 设置 部门编码
      * @param deptCode
      */
      public MatterDatumQuery deptCode(String deptCode){
      ......@@ -1184,7 +1260,7 @@ public class MatterDatumQuery extends MatterDatumEntity {
      }
      /**
      * 设置 部门编号
      * 设置 部门编码
      * @param deptCodeList
      */
      public MatterDatumQuery deptCodeList(List<String> deptCodeList){
      ......@@ -1429,6 +1505,51 @@ public class MatterDatumQuery extends MatterDatumEntity {
      return this;
      }
      /**
      * 设置 样表打印次数
      * @param samplePrint
      */
      public MatterDatumQuery samplePrint(Integer samplePrint){
      setSamplePrint(samplePrint);
      return this;
      }
      /**
      * 设置 开始 样表打印次数
      * @param samplePrintStart
      */
      public MatterDatumQuery samplePrintStart(Integer samplePrintStart){
      this.samplePrintStart = samplePrintStart;
      return this;
      }
      /**
      * 设置 结束 样表打印次数
      * @param samplePrintEnd
      */
      public MatterDatumQuery samplePrintEnd(Integer samplePrintEnd){
      this.samplePrintEnd = samplePrintEnd;
      return this;
      }
      /**
      * 设置 增加 样表打印次数
      * @param samplePrintIncrement
      */
      public MatterDatumQuery samplePrintIncrement(Integer samplePrintIncrement){
      this.samplePrintIncrement = samplePrintIncrement;
      return this;
      }
      /**
      * 设置 样表打印次数
      * @param samplePrintList
      */
      public MatterDatumQuery samplePrintList(List<Integer> samplePrintList){
      this.samplePrintList = samplePrintList;
      return this;
      }
      /**
      * 设置 填单的附件名称
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java
      View file @ 779a8a90
      ......@@ -10,6 +10,9 @@ 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.hotword.model.HotwordEntity;
      import com.mortals.xhx.module.hotword.model.HotwordQuery;
      import com.mortals.xhx.module.hotword.service.HotwordService;
      import com.mortals.xhx.module.matter.model.MatterDatumQuery;
      import com.mortals.xhx.module.matter.service.MatterDatumService;
      import org.springframework.beans.factory.annotation.Autowired;
      ......@@ -44,6 +47,8 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
      @Autowired
      private ParamService paramService;
      @Autowired
      private HotwordService hotwordService;
      @Autowired
      private MatterDatumService matterDatumService;
      ......@@ -65,8 +70,24 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
      query.setMatterName("%".concat(query.getMatterName()).concat("%"));
      }
      List<OrderCol> orderColList = new ArrayList<>();
      orderColList.add(new OrderCol("createTime",OrderCol.DESCENDING));
      orderColList.add(new OrderCol("isRecommend",OrderCol.DESCENDING));
      query.setOrderColList(orderColList);
      //添加更新热门词汇
      HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(query.getSiteId()).hotwords(query.getMatterName()), context);
      if (ObjectUtils.isEmpty(hotwordEntity)) {
      //新增
      hotwordEntity = new HotwordEntity();
      hotwordEntity.initAttrValue();
      hotwordEntity.setHotwords(query.getMatterName());
      hotwordEntity.setSearchCount(1);
      hotwordService.save(hotwordEntity, context);
      } else {
      //更新
      hotwordEntity.setSearchCount(1+hotwordEntity.getSearchCount());
      hotwordService.update(hotwordEntity,context);
      }
      super.doListBefore(query, model, context);
      }
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
      View file @ 779a8a90
      package com.mortals.xhx.module.matter.web;
      import com.mortals.framework.annotation.UnAuth;
      import com.mortals.framework.common.Rest;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.OrderCol;
      import com.mortals.framework.model.PageInfo;
      import com.mortals.framework.model.Result;
      import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
      import com.mortals.xhx.base.system.param.service.ParamService;
      import com.mortals.xhx.common.key.ParamKey;
      import com.mortals.xhx.common.utils.MemoryPagination;
      import com.mortals.xhx.common.utils.StringUtils;
      import com.mortals.xhx.module.hotword.model.HotwordEntity;
      import com.mortals.xhx.module.hotword.model.HotwordQuery;
      import com.mortals.xhx.module.hotword.service.HotwordService;
      import com.mortals.xhx.module.matter.model.MatterDatumQuery;
      import org.checkerframework.checker.units.qual.A;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.util.ObjectUtils;
      import org.springframework.web.bind.annotation.RequestMapping;
      import org.springframework.web.bind.annotation.RestController;
      import org.springframework.web.bind.annotation.*;
      import com.mortals.framework.model.Context;
      import javax.servlet.http.HttpServletRequest;
      import javax.servlet.http.HttpServletResponse;
      import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
      import com.mortals.xhx.module.matter.model.MatterDatumEntity;
      import com.mortals.xhx.module.matter.service.MatterDatumService;
      ......@@ -20,32 +33,36 @@ import org.apache.commons.lang3.ArrayUtils;
      import java.util.*;
      import java.util.stream.Collectors;
      import com.alibaba.fastjson.JSONObject;
      import org.springframework.web.bind.annotation.*;
      import org.springframework.web.multipart.MultipartFile;
      import static com.mortals.framework.ap.SysConstains.*;
      /**
      *
      * 事项申请材料
      *
      * @author zxfei
      * @date 2022-09-27
      */
      * 事项申请材料
      *
      * @author zxfei
      * @date 2022-09-27
      */
      @RestController
      @RequestMapping("matter/datum")
      public class MatterDatumController extends BaseCRUDJsonBodyMappingController<MatterDatumService,MatterDatumEntity,Long> {
      public class MatterDatumController extends BaseCRUDJsonBodyMappingController<MatterDatumService, MatterDatumEntity, Long> {
      @Autowired
      private ParamService paramService;
      @Autowired
      private HotwordService hotwordService;
      public MatterDatumController(){
      super.setModuleDesc( "事项申请材料");
      public MatterDatumController() {
      super.setModuleDesc("事项申请材料");
      }
      @Override
      protected void init(Map<String, Object> model, Context context) {
      this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatum","source"));
      this.addDict(model, "isRecommend", paramService.getParamBySecondOrganize("MatterDatum","isRecommend"));
      this.addDict(model, "source", paramService.getParamBySecondOrganize("MatterDatum", "source"));
      this.addDict(model, "isRecommend", paramService.getParamBySecondOrganize("MatterDatum", "isRecommend"));
      super.init(model, context);
      }
      ......@@ -53,9 +70,25 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
      protected void doListBefore(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
      if (StringUtils.isNotEmpty(query.getMatterName())) {
      query.setMatterName("%".concat(query.getMatterName()).concat("%"));
      //添加更新热门词汇
      HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(query.getSiteId()).hotwords(query.getMatterName()), context);
      if (ObjectUtils.isEmpty(hotwordEntity)) {
      //新增
      hotwordEntity = new HotwordEntity();
      hotwordEntity.initAttrValue();
      hotwordEntity.setHotwords(query.getMatterName());
      hotwordEntity.setSearchCount(1);
      hotwordService.save(hotwordEntity, context);
      } else {
      //更新
      hotwordEntity.setSearchCount(1 + hotwordEntity.getSearchCount());
      hotwordService.update(hotwordEntity, context);
      }
      }
      List<OrderCol> orderColList = new ArrayList<>();
      orderColList.add(new OrderCol("isRecommend",OrderCol.DESCENDING));
      orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
      orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING));
      query.setOrderColList(orderColList);
      super.doListBefore(query, model, context);
      }
      ......@@ -103,4 +136,40 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
      ret.put("data", model);
      return ret.toJSONString();
      }
      //空白样表查询
      @PostMapping(value = "blanklist")
      @UnAuth
      public Rest<Object> list(@RequestBody MatterDatumQuery query) {
      Rest<Object> ret = new Rest<>();
      Map<String, Object> model = new HashMap<>();
      Context context = this.getContext();
      String busiDesc = "查询空白样表";
      int code = VALUE_RESULT_SUCCESS;
      try {
      //PageInfo pageInfo = buildPageInfo(query);
      HotwordQuery hotwordQuery = new HotwordQuery();
      HotwordEntity hotwordEntity = hotwordService.selectOne(hotwordQuery.siteId(query.getSiteId()));
      int blankCount = hotwordEntity == null ? 20 : hotwordEntity.getPrintDisplay(); //空白样表数量
      PageInfo pageInfo = new PageInfo();
      pageInfo.setPrePageResult(blankCount);
      Result<MatterDatumEntity> result = this.service.find(query, pageInfo, context);
      //内存分页
      List<MatterDatumEntity> pagination = MemoryPagination.pagination(result.getList(), query.getPage(), query.getSize());
      model.put(KEY_RESULT_DATA, pagination);
      model.put(PAGEINFO_KEY, result.getPageInfo());
      model.put(MESSAGE_INFO, busiDesc + "成功");
      recordSysLog(request, busiDesc + " 【成功】");
      } catch (Exception e) {
      code = VALUE_RESULT_FAILURE;
      this.doException(request, busiDesc, model, e);
      }
      ret.setCode(code);
      ret.setData(model);
      ret.setDict(model.get(KEY_RESULT_DICT));
      ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
      return ret;
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/dao/MortalsFillMatterDatumPrintDao.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.dao;
      import com.mortals.framework.dao.ICRUDDao;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      import java.util.List;
      /**
      * 打印提交Dao
      * 打印提交 DAO接口
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public interface MortalsFillMatterDatumPrintDao extends ICRUDDao<MortalsFillMatterDatumPrintEntity,Long>{
      }
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/dao/ibatis/MortalsFillMatterDatumPrintDaoImpl.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.dao.ibatis;
      import org.springframework.stereotype.Repository;
      import com.mortals.xhx.module.mortals.dao.MortalsFillMatterDatumPrintDao;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      import java.util.Date;
      import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
      import java.util.List;
      /**
      * 打印提交DaoImpl DAO接口
      *
      * @author zxfei
      * @date 2022-12-07
      */
      @Repository("mortalsFillMatterDatumPrintDao")
      public class MortalsFillMatterDatumPrintDaoImpl extends BaseCRUDDaoMybatis<MortalsFillMatterDatumPrintEntity,Long> implements MortalsFillMatterDatumPrintDao {
      }
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/model/MortalsFillMatterDatumPrintEntity.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.model;
      import java.util.List;
      import java.util.ArrayList;
      import com.fasterxml.jackson.annotation.JsonFormat;
      import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.mortals.model.vo.MortalsFillMatterDatumPrintVo;
      /**
      * 打印提交实体对象
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public class MortalsFillMatterDatumPrintEntity extends MortalsFillMatterDatumPrintVo {
      private static final long serialVersionUID = 1L;
      /**
      * 打印订单
      */
      private String orderId;
      /**
      * 材料Id
      */
      private Long materialId;
      /**
      * 材料名
      */
      private String materialName;
      /**
      * 材料页数
      */
      private Integer page;
      /**
      * 打印类型(1.本地打印,2.在线打印)
      */
      private Integer type;
      /**
      * 合成doc后地址
      */
      private String docPath;
      /**
      * 提交的表单
      */
      private String formContent;
      public MortalsFillMatterDatumPrintEntity(){}
      /**
      * 获取 打印订单
      * @return String
      */
      public String getOrderId(){
      return orderId;
      }
      /**
      * 设置 打印订单
      * @param orderId
      */
      public void setOrderId(String orderId){
      this.orderId = orderId;
      }
      /**
      * 获取 材料Id
      * @return Long
      */
      public Long getMaterialId(){
      return materialId;
      }
      /**
      * 设置 材料Id
      * @param materialId
      */
      public void setMaterialId(Long materialId){
      this.materialId = materialId;
      }
      /**
      * 获取 材料名
      * @return String
      */
      public String getMaterialName(){
      return materialName;
      }
      /**
      * 设置 材料名
      * @param materialName
      */
      public void setMaterialName(String materialName){
      this.materialName = materialName;
      }
      /**
      * 获取 材料页数
      * @return Integer
      */
      public Integer getPage(){
      return page;
      }
      /**
      * 设置 材料页数
      * @param page
      */
      public void setPage(Integer page){
      this.page = page;
      }
      /**
      * 获取 打印类型(1.本地打印,2.在线打印)
      * @return Integer
      */
      public Integer getType(){
      return type;
      }
      /**
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param type
      */
      public void setType(Integer type){
      this.type = type;
      }
      /**
      * 获取 合成doc后地址
      * @return String
      */
      public String getDocPath(){
      return docPath;
      }
      /**
      * 设置 合成doc后地址
      * @param docPath
      */
      public void setDocPath(String docPath){
      this.docPath = docPath;
      }
      /**
      * 获取 提交的表单
      * @return String
      */
      public String getFormContent(){
      return formContent;
      }
      /**
      * 设置 提交的表单
      * @param formContent
      */
      public void setFormContent(String formContent){
      this.formContent = formContent;
      }
      @Override
      public int hashCode() {
      return this.getId().hashCode();
      }
      @Override
      public boolean equals(Object obj) {
      if (obj == null) return false;
      if (obj instanceof MortalsFillMatterDatumPrintEntity) {
      MortalsFillMatterDatumPrintEntity tmp = (MortalsFillMatterDatumPrintEntity) obj;
      if (this.getId() == tmp.getId()) {
      return true;
      }
      }
      return false;
      }
      public String toString(){
      StringBuilder sb = new StringBuilder("");
      sb.append(",orderId:").append(getOrderId());
      sb.append(",materialId:").append(getMaterialId());
      sb.append(",materialName:").append(getMaterialName());
      sb.append(",page:").append(getPage());
      sb.append(",type:").append(getType());
      sb.append(",docPath:").append(getDocPath());
      sb.append(",formContent:").append(getFormContent());
      return sb.toString();
      }
      public void initAttrValue(){
      this.orderId = null;
      this.materialId = null;
      this.materialName = null;
      this.page = null;
      this.type = 1;
      this.docPath = null;
      this.formContent = null;
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/model/MortalsFillMatterDatumPrintQuery.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.model;
      import java.util.List;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      /**
      * 打印提交查询对象
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public class MortalsFillMatterDatumPrintQuery extends MortalsFillMatterDatumPrintEntity {
      /** 开始 主键，自增长 */
      private Long idStart;
      /** 结束 主键，自增长 */
      private Long idEnd;
      /** 增加 主键，自增长 */
      private Long idIncrement;
      /** 主键，自增长列表 */
      private List <Long> idList;
      /** 打印订单 */
      private List<String> orderIdList;
      /** 开始 材料Id */
      private Long materialIdStart;
      /** 结束 材料Id */
      private Long materialIdEnd;
      /** 增加 材料Id */
      private Long materialIdIncrement;
      /** 材料Id列表 */
      private List <Long> materialIdList;
      /** 材料名 */
      private List<String> materialNameList;
      /** 开始 材料页数 */
      private Integer pageStart;
      /** 结束 材料页数 */
      private Integer pageEnd;
      /** 增加 材料页数 */
      private Integer pageIncrement;
      /** 材料页数列表 */
      private List <Integer> pageList;
      /** 开始 打印类型(1.本地打印,2.在线打印) */
      private Integer typeStart;
      /** 结束 打印类型(1.本地打印,2.在线打印) */
      private Integer typeEnd;
      /** 增加 打印类型(1.本地打印,2.在线打印) */
      private Integer typeIncrement;
      /** 打印类型(1.本地打印,2.在线打印)列表 */
      private List <Integer> typeList;
      /** 合成doc后地址 */
      private List<String> docPathList;
      /** 提交的表单 */
      private List<String> formContentList;
      /** 开始 创建时间 */
      private String createTimeStart;
      /** 结束 创建时间 */
      private String createTimeEnd;
      /** 开始 创建用户 */
      private Long createUserIdStart;
      /** 结束 创建用户 */
      private Long createUserIdEnd;
      /** 增加 创建用户 */
      private Long createUserIdIncrement;
      /** 创建用户列表 */
      private List <Long> createUserIdList;
      /** 开始 修改时间 */
      private String updateTimeStart;
      /** 结束 修改时间 */
      private String updateTimeEnd;
      /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
      private List<MortalsFillMatterDatumPrintQuery> orConditionList;
      /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
      private List<MortalsFillMatterDatumPrintQuery> andConditionList;
      public MortalsFillMatterDatumPrintQuery(){}
      /**
      * 获取 开始 主键，自增长
      * @return idStart
      */
      public Long getIdStart(){
      return this.idStart;
      }
      /**
      * 设置 开始 主键，自增长
      * @param idStart
      */
      public void setIdStart(Long idStart){
      this.idStart = idStart;
      }
      /**
      * 获取 结束 主键，自增长
      * @return $idEnd
      */
      public Long getIdEnd(){
      return this.idEnd;
      }
      /**
      * 设置 结束 主键，自增长
      * @param idEnd
      */
      public void setIdEnd(Long idEnd){
      this.idEnd = idEnd;
      }
      /**
      * 获取 增加 主键，自增长
      * @return idIncrement
      */
      public Long getIdIncrement(){
      return this.idIncrement;
      }
      /**
      * 设置 增加 主键，自增长
      * @param idIncrement
      */
      public void setIdIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      }
      /**
      * 获取 主键，自增长
      * @return idList
      */
      public List<Long> getIdList(){
      return this.idList;
      }
      /**
      * 设置 主键，自增长
      * @param idList
      */
      public void setIdList(List<Long> idList){
      this.idList = idList;
      }
      /**
      * 获取 打印订单
      * @return orderIdList
      */
      public List<String> getOrderIdList(){
      return this.orderIdList;
      }
      /**
      * 设置 打印订单
      * @param orderIdList
      */
      public void setOrderIdList(List<String> orderIdList){
      this.orderIdList = orderIdList;
      }
      /**
      * 获取 开始 材料Id
      * @return materialIdStart
      */
      public Long getMaterialIdStart(){
      return this.materialIdStart;
      }
      /**
      * 设置 开始 材料Id
      * @param materialIdStart
      */
      public void setMaterialIdStart(Long materialIdStart){
      this.materialIdStart = materialIdStart;
      }
      /**
      * 获取 结束 材料Id
      * @return $materialIdEnd
      */
      public Long getMaterialIdEnd(){
      return this.materialIdEnd;
      }
      /**
      * 设置 结束 材料Id
      * @param materialIdEnd
      */
      public void setMaterialIdEnd(Long materialIdEnd){
      this.materialIdEnd = materialIdEnd;
      }
      /**
      * 获取 增加 材料Id
      * @return materialIdIncrement
      */
      public Long getMaterialIdIncrement(){
      return this.materialIdIncrement;
      }
      /**
      * 设置 增加 材料Id
      * @param materialIdIncrement
      */
      public void setMaterialIdIncrement(Long materialIdIncrement){
      this.materialIdIncrement = materialIdIncrement;
      }
      /**
      * 获取 材料Id
      * @return materialIdList
      */
      public List<Long> getMaterialIdList(){
      return this.materialIdList;
      }
      /**
      * 设置 材料Id
      * @param materialIdList
      */
      public void setMaterialIdList(List<Long> materialIdList){
      this.materialIdList = materialIdList;
      }
      /**
      * 获取 材料名
      * @return materialNameList
      */
      public List<String> getMaterialNameList(){
      return this.materialNameList;
      }
      /**
      * 设置 材料名
      * @param materialNameList
      */
      public void setMaterialNameList(List<String> materialNameList){
      this.materialNameList = materialNameList;
      }
      /**
      * 获取 开始 材料页数
      * @return pageStart
      */
      public Integer getPageStart(){
      return this.pageStart;
      }
      /**
      * 设置 开始 材料页数
      * @param pageStart
      */
      public void setPageStart(Integer pageStart){
      this.pageStart = pageStart;
      }
      /**
      * 获取 结束 材料页数
      * @return $pageEnd
      */
      public Integer getPageEnd(){
      return this.pageEnd;
      }
      /**
      * 设置 结束 材料页数
      * @param pageEnd
      */
      public void setPageEnd(Integer pageEnd){
      this.pageEnd = pageEnd;
      }
      /**
      * 获取 增加 材料页数
      * @return pageIncrement
      */
      public Integer getPageIncrement(){
      return this.pageIncrement;
      }
      /**
      * 设置 增加 材料页数
      * @param pageIncrement
      */
      public void setPageIncrement(Integer pageIncrement){
      this.pageIncrement = pageIncrement;
      }
      /**
      * 获取 材料页数
      * @return pageList
      */
      public List<Integer> getPageList(){
      return this.pageList;
      }
      /**
      * 设置 材料页数
      * @param pageList
      */
      public void setPageList(List<Integer> pageList){
      this.pageList = pageList;
      }
      /**
      * 获取 开始 打印类型(1.本地打印,2.在线打印)
      * @return typeStart
      */
      public Integer getTypeStart(){
      return this.typeStart;
      }
      /**
      * 设置 开始 打印类型(1.本地打印,2.在线打印)
      * @param typeStart
      */
      public void setTypeStart(Integer typeStart){
      this.typeStart = typeStart;
      }
      /**
      * 获取 结束 打印类型(1.本地打印,2.在线打印)
      * @return $typeEnd
      */
      public Integer getTypeEnd(){
      return this.typeEnd;
      }
      /**
      * 设置 结束 打印类型(1.本地打印,2.在线打印)
      * @param typeEnd
      */
      public void setTypeEnd(Integer typeEnd){
      this.typeEnd = typeEnd;
      }
      /**
      * 获取 增加 打印类型(1.本地打印,2.在线打印)
      * @return typeIncrement
      */
      public Integer getTypeIncrement(){
      return this.typeIncrement;
      }
      /**
      * 设置 增加 打印类型(1.本地打印,2.在线打印)
      * @param typeIncrement
      */
      public void setTypeIncrement(Integer typeIncrement){
      this.typeIncrement = typeIncrement;
      }
      /**
      * 获取 打印类型(1.本地打印,2.在线打印)
      * @return typeList
      */
      public List<Integer> getTypeList(){
      return this.typeList;
      }
      /**
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeList
      */
      public void setTypeList(List<Integer> typeList){
      this.typeList = typeList;
      }
      /**
      * 获取 合成doc后地址
      * @return docPathList
      */
      public List<String> getDocPathList(){
      return this.docPathList;
      }
      /**
      * 设置 合成doc后地址
      * @param docPathList
      */
      public void setDocPathList(List<String> docPathList){
      this.docPathList = docPathList;
      }
      /**
      * 获取 提交的表单
      * @return formContentList
      */
      public List<String> getFormContentList(){
      return this.formContentList;
      }
      /**
      * 设置 提交的表单
      * @param formContentList
      */
      public void setFormContentList(List<String> formContentList){
      this.formContentList = formContentList;
      }
      /**
      * 获取 开始 创建时间
      * @return createTimeStart
      */
      public String getCreateTimeStart(){
      return this.createTimeStart;
      }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      }
      /**
      * 获取 结束 创建时间
      * @return createTimeEnd
      */
      public String getCreateTimeEnd(){
      return this.createTimeEnd;
      }
      /**
      * 设置 结束 创建时间
      * @param createTimeEnd
      */
      public void setCreateTimeEnd(String createTimeEnd){
      this.createTimeEnd = createTimeEnd;
      }
      /**
      * 获取 开始 创建用户
      * @return createUserIdStart
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      }
      /**
      * 设置 开始 创建用户
      * @param createUserIdStart
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 结束 创建用户
      * @return $createUserIdEnd
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      }
      /**
      * 设置 结束 创建用户
      * @param createUserIdEnd
      */
      public void setCreateUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      }
      /**
      * 获取 增加 创建用户
      * @return createUserIdIncrement
      */
      public Long getCreateUserIdIncrement(){
      return this.createUserIdIncrement;
      }
      /**
      * 设置 增加 创建用户
      * @param createUserIdIncrement
      */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      }
      /**
      * 获取 创建用户
      * @return createUserIdList
      */
      public List<Long> getCreateUserIdList(){
      return this.createUserIdList;
      }
      /**
      * 设置 创建用户
      * @param createUserIdList
      */
      public void setCreateUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      }
      /**
      * 获取 开始 修改时间
      * @return updateTimeStart
      */
      public String getUpdateTimeStart(){
      return this.updateTimeStart;
      }
      /**
      * 设置 开始 修改时间
      * @param updateTimeStart
      */
      public void setUpdateTimeStart(String updateTimeStart){
      this.updateTimeStart = updateTimeStart;
      }
      /**
      * 获取 结束 修改时间
      * @return updateTimeEnd
      */
      public String getUpdateTimeEnd(){
      return this.updateTimeEnd;
      }
      /**
      * 设置 结束 修改时间
      * @param updateTimeEnd
      */
      public void setUpdateTimeEnd(String updateTimeEnd){
      this.updateTimeEnd = updateTimeEnd;
      }
      /**
      * 设置 主键，自增长
      * @param id
      */
      public MortalsFillMatterDatumPrintQuery id(Long id){
      setId(id);
      return this;
      }
      /**
      * 设置 开始 主键，自增长
      * @param idStart
      */
      public MortalsFillMatterDatumPrintQuery idStart(Long idStart){
      this.idStart = idStart;
      return this;
      }
      /**
      * 设置 结束 主键，自增长
      * @param idEnd
      */
      public MortalsFillMatterDatumPrintQuery idEnd(Long idEnd){
      this.idEnd = idEnd;
      return this;
      }
      /**
      * 设置 增加 主键，自增长
      * @param idIncrement
      */
      public MortalsFillMatterDatumPrintQuery idIncrement(Long idIncrement){
      this.idIncrement = idIncrement;
      return this;
      }
      /**
      * 设置 主键，自增长
      * @param idList
      */
      public MortalsFillMatterDatumPrintQuery idList(List<Long> idList){
      this.idList = idList;
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderId
      */
      public MortalsFillMatterDatumPrintQuery orderId(String orderId){
      setOrderId(orderId);
      return this;
      }
      /**
      * 设置 打印订单
      * @param orderIdList
      */
      public MortalsFillMatterDatumPrintQuery orderIdList(List<String> orderIdList){
      this.orderIdList = orderIdList;
      return this;
      }
      /**
      * 设置 材料Id
      * @param materialId
      */
      public MortalsFillMatterDatumPrintQuery materialId(Long materialId){
      setMaterialId(materialId);
      return this;
      }
      /**
      * 设置 开始 材料Id
      * @param materialIdStart
      */
      public MortalsFillMatterDatumPrintQuery materialIdStart(Long materialIdStart){
      this.materialIdStart = materialIdStart;
      return this;
      }
      /**
      * 设置 结束 材料Id
      * @param materialIdEnd
      */
      public MortalsFillMatterDatumPrintQuery materialIdEnd(Long materialIdEnd){
      this.materialIdEnd = materialIdEnd;
      return this;
      }
      /**
      * 设置 增加 材料Id
      * @param materialIdIncrement
      */
      public MortalsFillMatterDatumPrintQuery materialIdIncrement(Long materialIdIncrement){
      this.materialIdIncrement = materialIdIncrement;
      return this;
      }
      /**
      * 设置 材料Id
      * @param materialIdList
      */
      public MortalsFillMatterDatumPrintQuery materialIdList(List<Long> materialIdList){
      this.materialIdList = materialIdList;
      return this;
      }
      /**
      * 设置 材料名
      * @param materialName
      */
      public MortalsFillMatterDatumPrintQuery materialName(String materialName){
      setMaterialName(materialName);
      return this;
      }
      /**
      * 设置 材料名
      * @param materialNameList
      */
      public MortalsFillMatterDatumPrintQuery materialNameList(List<String> materialNameList){
      this.materialNameList = materialNameList;
      return this;
      }
      /**
      * 设置 材料页数
      * @param page
      */
      public MortalsFillMatterDatumPrintQuery page(Integer page){
      setPage(page);
      return this;
      }
      /**
      * 设置 开始 材料页数
      * @param pageStart
      */
      public MortalsFillMatterDatumPrintQuery pageStart(Integer pageStart){
      this.pageStart = pageStart;
      return this;
      }
      /**
      * 设置 结束 材料页数
      * @param pageEnd
      */
      public MortalsFillMatterDatumPrintQuery pageEnd(Integer pageEnd){
      this.pageEnd = pageEnd;
      return this;
      }
      /**
      * 设置 增加 材料页数
      * @param pageIncrement
      */
      public MortalsFillMatterDatumPrintQuery pageIncrement(Integer pageIncrement){
      this.pageIncrement = pageIncrement;
      return this;
      }
      /**
      * 设置 材料页数
      * @param pageList
      */
      public MortalsFillMatterDatumPrintQuery pageList(List<Integer> pageList){
      this.pageList = pageList;
      return this;
      }
      /**
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param type
      */
      public MortalsFillMatterDatumPrintQuery type(Integer type){
      setType(type);
      return this;
      }
      /**
      * 设置 开始 打印类型(1.本地打印,2.在线打印)
      * @param typeStart
      */
      public MortalsFillMatterDatumPrintQuery typeStart(Integer typeStart){
      this.typeStart = typeStart;
      return this;
      }
      /**
      * 设置 结束 打印类型(1.本地打印,2.在线打印)
      * @param typeEnd
      */
      public MortalsFillMatterDatumPrintQuery typeEnd(Integer typeEnd){
      this.typeEnd = typeEnd;
      return this;
      }
      /**
      * 设置 增加 打印类型(1.本地打印,2.在线打印)
      * @param typeIncrement
      */
      public MortalsFillMatterDatumPrintQuery typeIncrement(Integer typeIncrement){
      this.typeIncrement = typeIncrement;
      return this;
      }
      /**
      * 设置 打印类型(1.本地打印,2.在线打印)
      * @param typeList
      */
      public MortalsFillMatterDatumPrintQuery typeList(List<Integer> typeList){
      this.typeList = typeList;
      return this;
      }
      /**
      * 设置 合成doc后地址
      * @param docPath
      */
      public MortalsFillMatterDatumPrintQuery docPath(String docPath){
      setDocPath(docPath);
      return this;
      }
      /**
      * 设置 合成doc后地址
      * @param docPathList
      */
      public MortalsFillMatterDatumPrintQuery docPathList(List<String> docPathList){
      this.docPathList = docPathList;
      return this;
      }
      /**
      * 设置 提交的表单
      * @param formContent
      */
      public MortalsFillMatterDatumPrintQuery formContent(String formContent){
      setFormContent(formContent);
      return this;
      }
      /**
      * 设置 提交的表单
      * @param formContentList
      */
      public MortalsFillMatterDatumPrintQuery formContentList(List<String> formContentList){
      this.formContentList = formContentList;
      return this;
      }
      /**
      * 设置 创建用户
      * @param createUserId
      */
      public MortalsFillMatterDatumPrintQuery createUserId(Long createUserId){
      setCreateUserId(createUserId);
      return this;
      }
      /**
      * 设置 开始 创建用户
      * @param createUserIdStart
      */
      public MortalsFillMatterDatumPrintQuery createUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      return this;
      }
      /**
      * 设置 结束 创建用户
      * @param createUserIdEnd
      */
      public MortalsFillMatterDatumPrintQuery createUserIdEnd(Long createUserIdEnd){
      this.createUserIdEnd = createUserIdEnd;
      return this;
      }
      /**
      * 设置 增加 创建用户
      * @param createUserIdIncrement
      */
      public MortalsFillMatterDatumPrintQuery createUserIdIncrement(Long createUserIdIncrement){
      this.createUserIdIncrement = createUserIdIncrement;
      return this;
      }
      /**
      * 设置 创建用户
      * @param createUserIdList
      */
      public MortalsFillMatterDatumPrintQuery createUserIdList(List<Long> createUserIdList){
      this.createUserIdList = createUserIdList;
      return this;
      }
      /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList
      */
      public List<MortalsFillMatterDatumPrintQuery> getOrConditionList(){
      return this.orConditionList;
      }
      /**
      * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @param orConditionList
      */
      public void setOrConditionList(List<MortalsFillMatterDatumPrintQuery> orConditionList){
      this.orConditionList = orConditionList;
      }
      /**
      * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
      * @return andConditionList
      */
      public List<MortalsFillMatterDatumPrintQuery> getAndConditionList(){
      return this.andConditionList;
      }
      /**
      * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
      * @param andConditionList
      */
      public void setAndConditionList(List<MortalsFillMatterDatumPrintQuery> andConditionList){
      this.andConditionList = andConditionList;
      }
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/model/vo/MortalsFillMatterDatumPrintVo.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.model.vo;
      import com.mortals.framework.model.BaseEntityLong;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      import java.util.ArrayList;
      import java.util.List;
      /**
      * 打印提交视图对象
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public class MortalsFillMatterDatumPrintVo extends BaseEntityLong {
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/service/MortalsFillMatterDatumPrintService.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.service;
      import com.mortals.framework.service.ICRUDService;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      /**
      * MortalsFillMatterDatumPrintService
      *
      * 打印提交 service接口
      *
      * @author zxfei
      * @date 2022-12-07
      */
      public interface MortalsFillMatterDatumPrintService extends ICRUDService<MortalsFillMatterDatumPrintEntity,Long>{
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/service/impl/MortalsFillMatterDatumPrintServiceImpl.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.service.impl;
      import org.springframework.stereotype.Service;
      import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
      import com.mortals.framework.exception.AppException;
      import com.mortals.framework.model.Context;
      import com.mortals.xhx.module.mortals.dao.MortalsFillMatterDatumPrintDao;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      import com.mortals.xhx.module.mortals.service.MortalsFillMatterDatumPrintService;
      /**
      * MortalsFillMatterDatumPrintService
      * 打印提交 service实现
      *
      * @author zxfei
      * @date 2022-12-07
      */
      @Service("mortalsFillMatterDatumPrintService")
      public class MortalsFillMatterDatumPrintServiceImpl extends AbstractCRUDServiceImpl<MortalsFillMatterDatumPrintDao, MortalsFillMatterDatumPrintEntity, Long> implements MortalsFillMatterDatumPrintService {
      }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/mortals/web/MortalsFillMatterDatumPrintController.java 0 → 100644
      View file @ 779a8a90
      package com.mortals.xhx.module.mortals.web;
      import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
      import com.mortals.xhx.base.system.param.service.ParamService;
      import org.springframework.beans.factory.annotation.Autowired;
      import org.springframework.web.bind.annotation.RequestMapping;
      import org.springframework.web.bind.annotation.RestController;
      import org.springframework.web.bind.annotation.*;
      import com.mortals.framework.model.Context;
      import javax.servlet.http.HttpServletRequest;
      import javax.servlet.http.HttpServletResponse;
      import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
      import com.mortals.xhx.module.mortals.model.MortalsFillMatterDatumPrintEntity;
      import com.mortals.xhx.module.mortals.service.MortalsFillMatterDatumPrintService;
      import org.apache.commons.lang3.ArrayUtils;
      import com.mortals.framework.util.StringUtils;
      import java.util.HashMap;
      import java.util.List;
      import java.util.Map;
      import java.util.stream.Collectors;
      import com.alibaba.fastjson.JSONObject;
      import java.util.Arrays;
      import org.springframework.web.bind.annotation.*;
      import org.springframework.web.multipart.MultipartFile;
      import static com.mortals.framework.ap.SysConstains.*;
      /**
      *
      * 打印提交
      *
      * @author zxfei
      * @date 2022-12-07
      */
      @RestController
      @RequestMapping("mortals/fill/matter/datum/print")
      public class MortalsFillMatterDatumPrintController extends BaseCRUDJsonBodyMappingController<MortalsFillMatterDatumPrintService,MortalsFillMatterDatumPrintEntity,Long> {
      @Autowired
      private ParamService paramService;
      public MortalsFillMatterDatumPrintController(){
      super.setModuleDesc( "打印提交");
      }
      @Override
      protected void init(Map<String, Object> model, Context context) {
      this.addDict(model, "type", paramService.getParamBySecondOrganize("MortalsFillMatterDatumPrint","type"));
      super.init(model, context);
      }
      }
      \ No newline at end of file
      fill-manager/src/main/resources/sqlmap/module/hotword/HotwordMapper.xml
      View file @ 779a8a90
      <?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.hotword.dao.ibatis.HotwordDaoImpl">
      <!-- 字段和属性映射 -->
      ......@@ -10,6 +10,8 @@
      <result property="hotwords" column="hotwords" />
      <result property="printDisplay" column="printDisplay" />
      <result property="newsSource" column="newsSource" />
      <result property="searchCount" column="searchCount" />
      <result property="wordsSource" column="wordsSource" />
      <result property="createTime" column="createTime" />
      <result property="createUserId" column="createUserId" />
      <result property="updateTime" column="updateTime" />
      ......@@ -35,6 +37,12 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('newsSource') or colPickMode == 1 and data.containsKey('newsSource')))">
      a.newsSource,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('searchCount') or colPickMode == 1 and data.containsKey('searchCount')))">
      a.searchCount,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('wordsSource') or colPickMode == 1 and data.containsKey('wordsSource')))">
      a.wordsSource,
      </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>
      ......@@ -49,18 +57,18 @@
      <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="HotwordEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_hotword
      (siteId,hotwords,printDisplay,newsSource,createTime,createUserId,updateTime)
      (siteId,hotwords,printDisplay,newsSource,searchCount,wordsSource,createTime,createUserId,updateTime)
      VALUES
      (#{siteId},#{hotwords},#{printDisplay},#{newsSource},#{createTime},#{createUserId},#{updateTime})
      (#{siteId},#{hotwords},#{printDisplay},#{newsSource},#{searchCount},#{wordsSource},#{createTime},#{createUserId},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_hotword
      (siteId,hotwords,printDisplay,newsSource,createTime,createUserId,updateTime)
      (siteId,hotwords,printDisplay,newsSource,searchCount,wordsSource,createTime,createUserId,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.siteId},#{item.hotwords},#{item.printDisplay},#{item.newsSource},#{item.createTime},#{item.createUserId},#{item.updateTime})
      (#{item.siteId},#{item.hotwords},#{item.printDisplay},#{item.newsSource},#{item.searchCount},#{item.wordsSource},#{item.createTime},#{item.createUserId},#{item.updateTime})
      </foreach>
      </insert>
      ......@@ -91,6 +99,18 @@
      <if test="(colPickMode==0 and data.containsKey('newsSourceIncrement')) or (colPickMode==1 and !data.containsKey('newsSourceIncrement'))">
      a.newsSource=ifnull(a.newsSource,0) + #{data.newsSourceIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('searchCount')) or (colPickMode==1 and !data.containsKey('searchCount'))">
      a.searchCount=#{data.searchCount},
      </if>
      <if test="(colPickMode==0 and data.containsKey('searchCountIncrement')) or (colPickMode==1 and !data.containsKey('searchCountIncrement'))">
      a.searchCount=ifnull(a.searchCount,0) + #{data.searchCountIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('wordsSource')) or (colPickMode==1 and !data.containsKey('wordsSource'))">
      a.wordsSource=#{data.wordsSource},
      </if>
      <if test="(colPickMode==0 and data.containsKey('wordsSourceIncrement')) or (colPickMode==1 and !data.containsKey('wordsSourceIncrement'))">
      a.wordsSource=ifnull(a.wordsSource,0) + #{data.wordsSourceIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
      a.createTime=#{data.createTime},
      </if>
      ......@@ -158,6 +178,30 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="searchCount=(case" suffix="ELSE searchCount end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('searchCount')) or (colPickMode==1 and !item.containsKey('searchCount'))">
      when a.id=#{item.id} then #{item.searchCount}
      </when>
      <when test="(colPickMode==0 and item.containsKey('searchCountIncrement')) or (colPickMode==1 and !item.containsKey('searchCountIncrement'))">
      when a.id=#{item.id} then ifnull(a.searchCount,0) + #{item.searchCountIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="wordsSource=(case" suffix="ELSE wordsSource end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('wordsSource')) or (colPickMode==1 and !item.containsKey('wordsSource'))">
      when a.id=#{item.id} then #{item.wordsSource}
      </when>
      <when test="(colPickMode==0 and item.containsKey('wordsSourceIncrement')) or (colPickMode==1 and !item.containsKey('wordsSourceIncrement'))">
      when a.id=#{item.id} then ifnull(a.wordsSource,0) + #{item.wordsSourceIncrement}
      </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'))">
      ......@@ -399,6 +443,48 @@
      ${_conditionType_} a.newsSource <![CDATA[ <= ]]> #{${_conditionParam_}.newsSourceEnd}
      </if>
      <if test="conditionParamRef.containsKey('searchCount')">
      <if test="conditionParamRef.searchCount != null ">
      ${_conditionType_} a.searchCount = #{${_conditionParam_}.searchCount}
      </if>
      <if test="conditionParamRef.searchCount == null">
      ${_conditionType_} a.searchCount is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('searchCountList')">
      ${_conditionType_} a.searchCount in
      <foreach collection="conditionParamRef.searchCountList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('searchCountStart') and conditionParamRef.searchCountStart != null">
      ${_conditionType_} a.searchCount <![CDATA[ >= ]]> #{${_conditionParam_}.searchCountStart}
      </if>
      <if test="conditionParamRef.containsKey('searchCountEnd') and conditionParamRef.searchCountEnd != null">
      ${_conditionType_} a.searchCount <![CDATA[ <= ]]> #{${_conditionParam_}.searchCountEnd}
      </if>
      <if test="conditionParamRef.containsKey('wordsSource')">
      <if test="conditionParamRef.wordsSource != null ">
      ${_conditionType_} a.wordsSource = #{${_conditionParam_}.wordsSource}
      </if>
      <if test="conditionParamRef.wordsSource == null">
      ${_conditionType_} a.wordsSource is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('wordsSourceList')">
      ${_conditionType_} a.wordsSource in
      <foreach collection="conditionParamRef.wordsSourceList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('wordsSourceStart') and conditionParamRef.wordsSourceStart != null">
      ${_conditionType_} a.wordsSource <![CDATA[ >= ]]> #{${_conditionParam_}.wordsSourceStart}
      </if>
      <if test="conditionParamRef.containsKey('wordsSourceEnd') and conditionParamRef.wordsSourceEnd != null">
      ${_conditionType_} a.wordsSource <![CDATA[ <= ]]> #{${_conditionParam_}.wordsSourceEnd}
      </if>
      <if test="conditionParamRef.containsKey('createTime')">
      <if test="conditionParamRef.createTime != null ">
      ......@@ -488,6 +574,16 @@
      <if test='orderCol.newsSource != null and "DESC".equalsIgnoreCase(orderCol.newsSource)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('searchCount')">
      a.searchCount
      <if test='orderCol.searchCount != null and "DESC".equalsIgnoreCase(orderCol.searchCount)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('wordsSource')">
      a.wordsSource
      <if test='orderCol.wordsSource != null and "DESC".equalsIgnoreCase(orderCol.wordsSource)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createTime')">
      a.createTime
      <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
      ......
      fill-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml
      View file @ 779a8a90
      ......@@ -6,8 +6,8 @@
      <!-- 字段和属性映射 -->
      <resultMap type="MatterDatumEntity" id="MatterDatumEntity-Map">
      <id property="id" column="id" />
      <result property="matterId" column="matterId" />
      <result property="siteId" column="siteId" />
      <result property="matterId" column="matterId" />
      <result property="deptId" column="deptId" />
      <result property="deptCode" column="deptCode" />
      <result property="deptName" column="deptName" />
      ......@@ -17,6 +17,7 @@
      <result property="isRecommend" column="isRecommend" />
      <result property="total" column="total" />
      <result property="sort" column="sort" />
      <result property="samplePrint" column="samplePrint" />
      <result property="fileName" column="fileName" />
      <result property="fileUrl" column="fileUrl" />
      <result property="sampleName" column="sampleName" />
      ......@@ -38,12 +39,12 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
      a.id,
      </if>
      <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('matterId') or colPickMode == 1 and data.containsKey('matterId')))">
      a.matterId,
      </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>
      ......@@ -71,6 +72,9 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
      a.sort,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('samplePrint') or colPickMode == 1 and data.containsKey('samplePrint')))">
      a.samplePrint,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
      a.fileName,
      </if>
      ......@@ -109,18 +113,18 @@
      <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="MatterDatumEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_matter_datum
      (matterId,siteId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
      (siteId,matterId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,samplePrint,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
      VALUES
      (#{matterId},#{siteId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{fileName},#{fileUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
      (#{siteId},#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{samplePrint},#{fileName},#{fileUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_matter_datum
      (matterId,siteId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
      (siteId,matterId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,samplePrint,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.matterId},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.fileName},#{item.fileUrl},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime})
      (#{item.siteId},#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.samplePrint},#{item.fileName},#{item.fileUrl},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime})
      </foreach>
      </insert>
      ......@@ -130,18 +134,18 @@
      update mortals_xhx_matter_datum as a
      set
      <trim suffixOverrides="," suffix="">
      <if test="(colPickMode==0 and data.containsKey('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
      a.matterId=#{data.matterId},
      </if>
      <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('matterId')) or (colPickMode==1 and !data.containsKey('matterId'))">
      a.matterId=#{data.matterId},
      </if>
      <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('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
      a.deptId=#{data.deptId},
      </if>
      ......@@ -184,6 +188,12 @@
      <if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
      a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('samplePrint')) or (colPickMode==1 and !data.containsKey('samplePrint'))">
      a.samplePrint=#{data.samplePrint},
      </if>
      <if test="(colPickMode==0 and data.containsKey('samplePrintIncrement')) or (colPickMode==1 and !data.containsKey('samplePrintIncrement'))">
      a.samplePrint=ifnull(a.samplePrint,0) + #{data.samplePrintIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
      a.fileName=#{data.fileName},
      </if>
      ......@@ -232,26 +242,26 @@
      <update id="updateBatch" parameterType="paramDto">
      update mortals_xhx_matter_datum as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="matterId=(case" suffix="ELSE matterId end),">
      <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('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
      when a.id=#{item.id} then #{item.matterId}
      <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('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
      <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="siteId=(case" suffix="ELSE siteId end),">
      <trim prefix="matterId=(case" suffix="ELSE matterId 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 test="(colPickMode==0 and item.containsKey('matterId')) or (colPickMode==1 and !item.containsKey('matterId'))">
      when a.id=#{item.id} then #{item.matterId}
      </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 test="(colPickMode==0 and item.containsKey('matterIdIncrement')) or (colPickMode==1 and !item.containsKey('matterIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.matterId,0) + #{item.matterIdIncrement}
      </when>
      </choose>
      </foreach>
      ......@@ -344,6 +354,18 @@
      </choose>
      </foreach>
      </trim>
      <trim prefix="samplePrint=(case" suffix="ELSE samplePrint end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('samplePrint')) or (colPickMode==1 and !item.containsKey('samplePrint'))">
      when a.id=#{item.id} then #{item.samplePrint}
      </when>
      <when test="(colPickMode==0 and item.containsKey('samplePrintIncrement')) or (colPickMode==1 and !item.containsKey('samplePrintIncrement'))">
      when a.id=#{item.id} then ifnull(a.samplePrint,0) + #{item.samplePrintIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="fileName=(case" suffix="ELSE fileName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
      ......@@ -563,27 +585,6 @@
      ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
      </if>
      <if test="conditionParamRef.containsKey('matterId')">
      <if test="conditionParamRef.matterId != null ">
      ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
      </if>
      <if test="conditionParamRef.matterId == null">
      ${_conditionType_} a.matterId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterIdList')">
      ${_conditionType_} a.matterId in
      <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
      ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
      </if>
      <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
      ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('siteId')">
      <if test="conditionParamRef.siteId != null ">
      ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
      ......@@ -605,6 +606,27 @@
      ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('matterId')">
      <if test="conditionParamRef.matterId != null ">
      ${_conditionType_} a.matterId = #{${_conditionParam_}.matterId}
      </if>
      <if test="conditionParamRef.matterId == null">
      ${_conditionType_} a.matterId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('matterIdList')">
      ${_conditionType_} a.matterId in
      <foreach collection="conditionParamRef.matterIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('matterIdStart') and conditionParamRef.matterIdStart != null">
      ${_conditionType_} a.matterId <![CDATA[ >= ]]> #{${_conditionParam_}.matterIdStart}
      </if>
      <if test="conditionParamRef.containsKey('matterIdEnd') and conditionParamRef.matterIdEnd != null">
      ${_conditionType_} a.matterId <![CDATA[ <= ]]> #{${_conditionParam_}.matterIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('deptId')">
      <if test="conditionParamRef.deptId != null ">
      ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
      ......@@ -770,6 +792,27 @@
      ${_conditionType_} a.sort <![CDATA[ <= ]]> #{${_conditionParam_}.sortEnd}
      </if>
      <if test="conditionParamRef.containsKey('samplePrint')">
      <if test="conditionParamRef.samplePrint != null ">
      ${_conditionType_} a.samplePrint = #{${_conditionParam_}.samplePrint}
      </if>
      <if test="conditionParamRef.samplePrint == null">
      ${_conditionType_} a.samplePrint is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('samplePrintList')">
      ${_conditionType_} a.samplePrint in
      <foreach collection="conditionParamRef.samplePrintList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('samplePrintStart') and conditionParamRef.samplePrintStart != null">
      ${_conditionType_} a.samplePrint <![CDATA[ >= ]]> #{${_conditionParam_}.samplePrintStart}
      </if>
      <if test="conditionParamRef.containsKey('samplePrintEnd') and conditionParamRef.samplePrintEnd != null">
      ${_conditionType_} a.samplePrint <![CDATA[ <= ]]> #{${_conditionParam_}.samplePrintEnd}
      </if>
      <if test="conditionParamRef.containsKey('fileName')">
      <if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
      ......@@ -959,16 +1002,16 @@
      <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('matterId')">
      a.matterId
      <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('matterId')">
      a.matterId
      <if test='orderCol.matterId != null and "DESC".equalsIgnoreCase(orderCol.matterId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deptId')">
      a.deptId
      <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
      ......@@ -1014,6 +1057,11 @@
      <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('samplePrint')">
      a.samplePrint
      <if test='orderCol.samplePrint != null and "DESC".equalsIgnoreCase(orderCol.samplePrint)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('fileName')">
      a.fileName
      <if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
      ......
      fill-manager/src/main/resources/sqlmap/module/mortals/MortalsFillMatterDatumPrintMapper.xml 0 → 100644
      View file @ 779a8a90
      <?xml version="1.0" encoding="UTF-8"?>
      <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
      "mybatis-3-mapper.dtd">
      <mapper namespace="com.mortals.xhx.module.mortals.dao.ibatis.MortalsFillMatterDatumPrintDaoImpl">
      <!-- 字段和属性映射 -->
      <resultMap type="MortalsFillMatterDatumPrintEntity" id="MortalsFillMatterDatumPrintEntity-Map">
      <id property="id" column="id" />
      <result property="orderId" column="orderId" />
      <result property="materialId" column="materialId" />
      <result property="materialName" column="materialName" />
      <result property="page" column="page" />
      <result property="type" column="type" />
      <result property="docPath" column="docPath" />
      <result property="formContent" column="formContent" />
      <result property="createTime" column="createTime" />
      <result property="createUserId" column="createUserId" />
      <result property="updateTime" column="updateTime" />
      </resultMap>
      <!-- 表所有列 -->
      <sql id="_columns">
      <trim suffixOverrides="," suffix="">
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
      a.id,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))">
      a.orderId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialId') or colPickMode == 1 and data.containsKey('materialId')))">
      a.materialId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
      a.materialName,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('page') or colPickMode == 1 and data.containsKey('page')))">
      a.page,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
      a.type,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('docPath') or colPickMode == 1 and data.containsKey('docPath')))">
      a.docPath,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('formContent') or colPickMode == 1 and data.containsKey('formContent')))">
      a.formContent,
      </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>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
      a.createUserId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
      a.updateTime,
      </if>
      </trim>
      </sql>
      <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="MortalsFillMatterDatumPrintEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_fill_matter_datum_print
      (orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime)
      VALUES
      (#{orderId},#{materialId},#{materialName},#{page},#{type},#{docPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
      </insert>
      <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_fill_matter_datum_print
      (orderId,materialId,materialName,page,type,docPath,formContent,createTime,createUserId,updateTime)
      VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.orderId},#{item.materialId},#{item.materialName},#{item.page},#{item.type},#{item.docPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime})
      </foreach>
      </insert>
      <!-- 根据ParamDto更新 -->
      <update id="update" parameterType="paramDto">
      update mortals_fill_matter_datum_print as a
      set
      <trim suffixOverrides="," suffix="">
      <if test="(colPickMode==0 and data.containsKey('orderId')) or (colPickMode==1 and !data.containsKey('orderId'))">
      a.orderId=#{data.orderId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialId')) or (colPickMode==1 and !data.containsKey('materialId'))">
      a.materialId=#{data.materialId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialIdIncrement')) or (colPickMode==1 and !data.containsKey('materialIdIncrement'))">
      a.materialId=ifnull(a.materialId,0) + #{data.materialIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
      a.materialName=#{data.materialName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('page')) or (colPickMode==1 and !data.containsKey('page'))">
      a.page=#{data.page},
      </if>
      <if test="(colPickMode==0 and data.containsKey('pageIncrement')) or (colPickMode==1 and !data.containsKey('pageIncrement'))">
      a.page=ifnull(a.page,0) + #{data.pageIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
      a.type=#{data.type},
      </if>
      <if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
      a.type=ifnull(a.type,0) + #{data.typeIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('docPath')) or (colPickMode==1 and !data.containsKey('docPath'))">
      a.docPath=#{data.docPath},
      </if>
      <if test="(colPickMode==0 and data.containsKey('formContent')) or (colPickMode==1 and !data.containsKey('formContent'))">
      a.formContent=#{data.formContent},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
      a.createTime=#{data.createTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
      a.createUserId=#{data.createUserId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
      a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime},
      </if>
      </trim>
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </update>
      <!-- 批量更新 -->
      <update id="updateBatch" parameterType="paramDto">
      update mortals_fill_matter_datum_print as a
      <trim prefix="set" suffixOverrides=",">
      <trim prefix="orderId=(case" suffix="ELSE orderId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('orderId')) or (colPickMode==1 and !item.containsKey('orderId'))">
      when a.id=#{item.id} then #{item.orderId}
      </if>
      </foreach>
      </trim>
      <trim prefix="materialId=(case" suffix="ELSE materialId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('materialId')) or (colPickMode==1 and !item.containsKey('materialId'))">
      when a.id=#{item.id} then #{item.materialId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('materialIdIncrement')) or (colPickMode==1 and !item.containsKey('materialIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.materialId,0) + #{item.materialIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="materialName=(case" suffix="ELSE materialName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
      when a.id=#{item.id} then #{item.materialName}
      </if>
      </foreach>
      </trim>
      <trim prefix="page=(case" suffix="ELSE page end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('page')) or (colPickMode==1 and !item.containsKey('page'))">
      when a.id=#{item.id} then #{item.page}
      </when>
      <when test="(colPickMode==0 and item.containsKey('pageIncrement')) or (colPickMode==1 and !item.containsKey('pageIncrement'))">
      when a.id=#{item.id} then ifnull(a.page,0) + #{item.pageIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="type=(case" suffix="ELSE type end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('type')) or (colPickMode==1 and !item.containsKey('type'))">
      when a.id=#{item.id} then #{item.type}
      </when>
      <when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))">
      when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="docPath=(case" suffix="ELSE docPath end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('docPath')) or (colPickMode==1 and !item.containsKey('docPath'))">
      when a.id=#{item.id} then #{item.docPath}
      </if>
      </foreach>
      </trim>
      <trim prefix="formContent=(case" suffix="ELSE formContent end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('formContent')) or (colPickMode==1 and !item.containsKey('formContent'))">
      when a.id=#{item.id} then #{item.formContent}
      </if>
      </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'))">
      when a.id=#{item.id} then #{item.createTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
      when a.id=#{item.id} then #{item.createUserId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
      when a.id=#{item.id} then #{item.updateTime}
      </if>
      </foreach>
      </trim>
      </trim>
      where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      #{item.id}
      </foreach>
      </update>
      <!-- 根据主健查询 -->
      <select id="getByKey" parameterType="paramDto" resultMap="MortalsFillMatterDatumPrintEntity-Map">
      select <include refid="_columns"/>
      from mortals_fill_matter_datum_print as a
      where a.id=#{condition.id}
      </select>
      <!-- 根据主健删除 -->
      <delete id="deleteByKey" parameterType="paramDto">
      delete a.* from mortals_fill_matter_datum_print as a where a.id=#{condition.id}
      </delete>
      <!-- 根据主健删除一批，针对单一主健有效 -->
      <delete id="deleteByKeys">
      delete from mortals_fill_matter_datum_print where id in
      <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据主健列表删除一批，针对单一主健有效 -->
      <delete id="deleteByKeyList">
      delete from mortals_fill_matter_datum_print where id in
      <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
      #{item}
      </foreach>
      </delete>
      <!-- 根据对象列表删除一批，针对单一主健有效 -->
      <delete id="deleteByEntityList">
      delete from mortals_fill_matter_datum_print where id in
      <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
      #{item.id}
      </foreach>
      </delete>
      <!-- 根据paramDto删除一批 -->
      <delete id="deleteByMap" parameterType="paramDto">
      delete a.* from mortals_fill_matter_datum_print as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </delete>
      <!-- 获取列表 -->
      <select id="getList" parameterType="paramDto" resultMap="MortalsFillMatterDatumPrintEntity-Map">
      select <include refid="_columns"/>
      from mortals_fill_matter_datum_print as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      <include refid="_orderCols_"/>
      </select>
      <!-- 获取 -->
      <select id="getListCount" parameterType="paramDto" resultType="int">
      select count(1)
      from mortals_fill_matter_datum_print as a
      <trim suffixOverrides="where" suffix="">
      where
      <trim prefixOverrides="and" prefix="">
      <include refid="_condition_"/>
      </trim>
      </trim>
      </select>
      <!-- 条件映射 -->
      <sql id="_condition_">
      <if test="condition != null and !condition.isEmpty()">
      <!-- 条件映射-普通条件 -->
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="condition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
      <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
      and
      <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
      <trim prefixOverrides="or" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="andCondition"/>
      <property name="_conditionType_" value="or"/>
      </include>
      </trim>
      </foreach>
      </if>
      <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
      <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
      and
      <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
      <trim prefixOverrides="and" prefix="(" suffix=")">
      <include refid="_condition_param_">
      <property name="_conditionParam_" value="orCondition"/>
      <property name="_conditionType_" value="and"/>
      </include>
      </trim>
      </foreach>
      </if>
      </if>
      </sql>
      <!-- 条件映射-代参数 -->
      <sql id="_condition_param_">
      <bind name="conditionParamRef" value="${_conditionParam_}"/>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null">
      ${_conditionType_} a.id=#{${_conditionParam_}.id}
      </if>
      </if>
      <if test="conditionParamRef.containsKey('id')">
      <if test="conditionParamRef.id != null ">
      ${_conditionType_} a.id = #{${_conditionParam_}.id}
      </if>
      <if test="conditionParamRef.id == null">
      ${_conditionType_} a.id is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('idList')">
      ${_conditionType_} a.id in
      <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
      ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
      </if>
      <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
      ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
      </if>
      <if test="conditionParamRef.containsKey('orderId')">
      <if test="conditionParamRef.orderId != null and conditionParamRef.orderId != ''">
      ${_conditionType_} a.orderId like #{${_conditionParam_}.orderId}
      </if>
      <if test="conditionParamRef.orderId == null">
      ${_conditionType_} a.orderId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('orderIdList')">
      ${_conditionType_} a.orderId in
      <foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialId')">
      <if test="conditionParamRef.materialId != null ">
      ${_conditionType_} a.materialId = #{${_conditionParam_}.materialId}
      </if>
      <if test="conditionParamRef.materialId == null">
      ${_conditionType_} a.materialId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('materialIdList')">
      ${_conditionType_} a.materialId in
      <foreach collection="conditionParamRef.materialIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('materialIdStart') and conditionParamRef.materialIdStart != null">
      ${_conditionType_} a.materialId <![CDATA[ >= ]]> #{${_conditionParam_}.materialIdStart}
      </if>
      <if test="conditionParamRef.containsKey('materialIdEnd') and conditionParamRef.materialIdEnd != null">
      ${_conditionType_} a.materialId <![CDATA[ <= ]]> #{${_conditionParam_}.materialIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('materialName')">
      <if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
      ${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
      </if>
      <if test="conditionParamRef.materialName == null">
      ${_conditionType_} a.materialName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('materialNameList')">
      ${_conditionType_} a.materialName in
      <foreach collection="conditionParamRef.materialNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('page')">
      <if test="conditionParamRef.page != null ">
      ${_conditionType_} a.page = #{${_conditionParam_}.page}
      </if>
      <if test="conditionParamRef.page == null">
      ${_conditionType_} a.page is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('pageList')">
      ${_conditionType_} a.page in
      <foreach collection="conditionParamRef.pageList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('pageStart') and conditionParamRef.pageStart != null">
      ${_conditionType_} a.page <![CDATA[ >= ]]> #{${_conditionParam_}.pageStart}
      </if>
      <if test="conditionParamRef.containsKey('pageEnd') and conditionParamRef.pageEnd != null">
      ${_conditionType_} a.page <![CDATA[ <= ]]> #{${_conditionParam_}.pageEnd}
      </if>
      <if test="conditionParamRef.containsKey('type')">
      <if test="conditionParamRef.type != null ">
      ${_conditionType_} a.type = #{${_conditionParam_}.type}
      </if>
      <if test="conditionParamRef.type == null">
      ${_conditionType_} a.type is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('typeList')">
      ${_conditionType_} a.type in
      <foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
      ${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
      </if>
      <if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null">
      ${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
      </if>
      <if test="conditionParamRef.containsKey('docPath')">
      <if test="conditionParamRef.docPath != null and conditionParamRef.docPath != ''">
      ${_conditionType_} a.docPath like #{${_conditionParam_}.docPath}
      </if>
      <if test="conditionParamRef.docPath == null">
      ${_conditionType_} a.docPath is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('docPathList')">
      ${_conditionType_} a.docPath in
      <foreach collection="conditionParamRef.docPathList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('formContent')">
      <if test="conditionParamRef.formContent != null and conditionParamRef.formContent != ''">
      ${_conditionType_} a.formContent like #{${_conditionParam_}.formContent}
      </if>
      <if test="conditionParamRef.formContent == null">
      ${_conditionType_} a.formContent is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('formContentList')">
      ${_conditionType_} a.formContent in
      <foreach collection="conditionParamRef.formContentList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createTime')">
      <if test="conditionParamRef.createTime != null ">
      ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
      </if>
      <if test="conditionParamRef.createTime == null">
      ${_conditionType_} a.createTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
      ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
      ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('createUserId')">
      <if test="conditionParamRef.createUserId != null ">
      ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
      </if>
      <if test="conditionParamRef.createUserId == null">
      ${_conditionType_} a.createUserId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList')">
      ${_conditionType_} a.createUserId in
      <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
      ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
      </if>
      <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
      ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('updateTime')">
      <if test="conditionParamRef.updateTime != null ">
      ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
      </if>
      <if test="conditionParamRef.updateTime == null">
      ${_conditionType_} a.updateTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
      ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <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>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind}
      </foreach>
      </trim>
      </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by
      <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')">
      a.id
      <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('orderId')">
      a.orderId
      <if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('materialId')">
      a.materialId
      <if test='orderCol.materialId != null and "DESC".equalsIgnoreCase(orderCol.materialId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('materialName')">
      a.materialName
      <if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('page')">
      a.page
      <if test='orderCol.page != null and "DESC".equalsIgnoreCase(orderCol.page)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('type')">
      a.type
      <if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('docPath')">
      a.docPath
      <if test='orderCol.docPath != null and "DESC".equalsIgnoreCase(orderCol.docPath)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('formContent')">
      a.formContent
      <if test='orderCol.formContent != null and "DESC".equalsIgnoreCase(orderCol.formContent)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createTime')">
      a.createTime
      <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('createUserId')">
      a.createUserId
      <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('updateTime')">
      a.updateTime
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      ,
      </if>
      </trim>
      </if>
      </sql>
      <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()">
      GROUP BY
      <trim suffixOverrides="," suffix="">
      <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
      ${item}
      </foreach>
      </trim>
      </if>
      </sql>
      </mapper>
      \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment