Skip to content

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

重构部分功能模块

parent f1797c1b
Pipeline #2359 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 226 additions and 37 deletions
      fill-manager/db/module.sql
      View file @ 9b48b0b5
      ...@@ -116,27 +116,31 @@ PRIMARY KEY (`id`) ...@@ -116,27 +116,31 @@ PRIMARY KEY (`id`)
      -- ---------------------------- -- ----------------------------
      DROP TABLE IF EXISTS `mortals_xhx_pubdatum`; DROP TABLE IF EXISTS `mortals_xhx_pubdatum`;
      CREATE TABLE mortals_xhx_pubdatum( CREATE TABLE mortals_xhx_pubdatum(
      `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
      `matterId` bigint(20) COMMENT '事项matter id', `matterId` bigint(20) COMMENT '事项matter id',
      `deptId` bigint(20) COMMENT '部门ID', `deptId` bigint(20) COMMENT '部门ID',
      `deptCode` varchar(256) COMMENT '部门编号', `deptCode` varchar(256) COMMENT '部门编号',
      `deptName` varchar(256) COMMENT '部门名称', `deptName` varchar(256) COMMENT '部门名称',
      `materialName` varchar(1024) NOT NULL COMMENT '材料名', `materialName` varchar(1024) NOT NULL COMMENT '材料名',
      `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名', `materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
      `total` int(8) COMMENT '填单次数', `total` int(8) COMMENT '填单次数',
      `sort` int(4) COMMENT '排序', `sort` int(4) COMMENT '排序',
      `sampleName` varchar(255) COMMENT '样表名称', `fileName` varchar(255) COMMENT '填单的附件名称',
      `samplePath` varchar(255) COMMENT '样表地址', `fileUrl` varchar(255) COMMENT '填单的附件下载地址',
      `templateName` varchar(255) COMMENT '模板名称', `sampleName` varchar(255) COMMENT '样表名称',
      `templatePath` varchar(255) COMMENT '模板地址', `samplePath` varchar(255) COMMENT '样表地址',
      `preViewPath` varchar(255) COMMENT '样表预览地址', `templateName` varchar(255) COMMENT '模板名称',
      `formContent` mediumtext COMMENT '表单内容', `templatePath` varchar(255) COMMENT '模板地址',
      `createTime` datetime COMMENT '创建时间', `preViewPath` varchar(255) COMMENT '样表预览地址',
      `createUserId` bigint(20) COMMENT '创建用户', `formContent` mediumtext COMMENT '表单内容',
      `updateTime` datetime COMMENT '修改时间', `createTime` datetime COMMENT '创建时间',
      PRIMARY KEY (`id`) `createUserId` bigint(20) COMMENT '创建用户',
      `updateTime` datetime COMMENT '修改时间',
      PRIMARY KEY (`id`)
      ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料公共库'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料公共库';
      -- ---------------------------- -- ----------------------------
      -- 热门词汇业务表 -- 热门词汇业务表
      -- ---------------------------- -- ----------------------------
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
      View file @ 9b48b0b5
      ...@@ -123,6 +123,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -123,6 +123,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
      PubdatumEntity pubdatumEntity = new PubdatumEntity(); PubdatumEntity pubdatumEntity = new PubdatumEntity();
      pubdatumEntity.initAttrValue(); pubdatumEntity.initAttrValue();
      BeanUtils.copyProperties(entity, pubdatumEntity, new String[]{"id"}); BeanUtils.copyProperties(entity, pubdatumEntity, new String[]{"id"});
      pubdatumEntity.setCreateTime(new Date()); pubdatumEntity.setCreateTime(new Date());
      pubdatumEntity.setCreateUserId(getContextUserId(context)); pubdatumEntity.setCreateUserId(getContextUserId(context));
      pubdatumService.save(pubdatumEntity, context); pubdatumService.save(pubdatumEntity, context);
      ...@@ -427,8 +428,8 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD ...@@ -427,8 +428,8 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
      } }
      private MatterDatumEntity updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) { private MatterDatumEntity updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) {
      MatterDatumEntity matterDatumEntity = this.selectOne(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName())); int count = this.count(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()),context);
      if (ObjectUtils.isEmpty(matterDatumEntity)) { if (count==0) {
      MatterDatumEntity entity = new MatterDatumEntity(); MatterDatumEntity entity = new MatterDatumEntity();
      BeanUtils.copyProperties(pubdatumEntity, entity, new String[]{"id", "matterId"}); BeanUtils.copyProperties(pubdatumEntity, entity, new String[]{"id", "matterId"});
      entity.setSiteId(siteId); entity.setSiteId(siteId);
      ......
      fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java
      View file @ 9b48b0b5
      ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.pubdatum.model.vo.PubdatumVo; ...@@ -10,7 +10,7 @@ import com.mortals.xhx.module.pubdatum.model.vo.PubdatumVo;
      * 事项材料公共库实体对象 * 事项材料公共库实体对象
      * *
      * @author zxfei * @author zxfei
      * @date 2022-11-18 * @date 2022-12-02
      */ */
      public class PubdatumEntity extends PubdatumVo { public class PubdatumEntity extends PubdatumVo {
      ...@@ -48,6 +48,14 @@ public class PubdatumEntity extends PubdatumVo { ...@@ -48,6 +48,14 @@ public class PubdatumEntity extends PubdatumVo {
      * 排序 * 排序
      */ */
      private Integer sort; private Integer sort;
      /**
      * 填单的附件名称
      */
      private String fileName;
      /**
      * 填单的附件下载地址
      */
      private String fileUrl;
      /** /**
      * 样表名称 * 样表名称
      */ */
      ...@@ -188,6 +196,34 @@ public class PubdatumEntity extends PubdatumVo { ...@@ -188,6 +196,34 @@ public class PubdatumEntity extends PubdatumVo {
      public void setSort(Integer sort){ public void setSort(Integer sort){
      this.sort = sort; this.sort = sort;
      } }
      /**
      * 获取 填单的附件名称
      * @return String
      */
      public String getFileName(){
      return fileName;
      }
      /**
      * 设置 填单的附件名称
      * @param fileName
      */
      public void setFileName(String fileName){
      this.fileName = fileName;
      }
      /**
      * 获取 填单的附件下载地址
      * @return String
      */
      public String getFileUrl(){
      return fileUrl;
      }
      /**
      * 设置 填单的附件下载地址
      * @param fileUrl
      */
      public void setFileUrl(String fileUrl){
      this.fileUrl = fileUrl;
      }
      /** /**
      * 获取 样表名称 * 获取 样表名称
      * @return String * @return String
      ...@@ -302,6 +338,8 @@ public class PubdatumEntity extends PubdatumVo { ...@@ -302,6 +338,8 @@ public class PubdatumEntity extends PubdatumVo {
      sb.append(",materiaFullName:").append(getMateriaFullName()); sb.append(",materiaFullName:").append(getMateriaFullName());
      sb.append(",total:").append(getTotal()); sb.append(",total:").append(getTotal());
      sb.append(",sort:").append(getSort()); sb.append(",sort:").append(getSort());
      sb.append(",fileName:").append(getFileName());
      sb.append(",fileUrl:").append(getFileUrl());
      sb.append(",sampleName:").append(getSampleName()); sb.append(",sampleName:").append(getSampleName());
      sb.append(",samplePath:").append(getSamplePath()); sb.append(",samplePath:").append(getSamplePath());
      sb.append(",templateName:").append(getTemplateName()); sb.append(",templateName:").append(getTemplateName());
      ...@@ -317,28 +355,32 @@ public class PubdatumEntity extends PubdatumVo { ...@@ -317,28 +355,32 @@ public class PubdatumEntity extends PubdatumVo {
      this.deptId = null; this.deptId = null;
      this.deptCode = ""; this.deptCode = null;
      this.deptName = ""; this.deptName = null;
      this.materialName = ""; this.materialName = null;
      this.materiaFullName = ""; this.materiaFullName = null;
      this.total = null; this.total = null;
      this.sort = null; this.sort = null;
      this.sampleName = ""; this.fileName = null;
      this.fileUrl = null;
      this.sampleName = null;
      this.samplePath = ""; this.samplePath = null;
      this.templateName = ""; this.templateName = null;
      this.templatePath = ""; this.templatePath = null;
      this.preViewPath = ""; this.preViewPath = null;
      this.formContent = ""; this.formContent = null;
      } }
      } }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumQuery.java
      View file @ 9b48b0b5
      ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.pubdatum.model.PubdatumEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
      * 事项材料公共库查询对象 * 事项材料公共库查询对象
      * *
      * @author zxfei * @author zxfei
      * @date 2022-11-18 * @date 2022-12-02
      */ */
      public class PubdatumQuery extends PubdatumEntity { public class PubdatumQuery extends PubdatumEntity {
      /** 开始 主键，自增长 */ /** 开始 主键，自增长 */
      ...@@ -81,6 +81,12 @@ public class PubdatumQuery extends PubdatumEntity { ...@@ -81,6 +81,12 @@ public class PubdatumQuery extends PubdatumEntity {
      /** 排序列表 */ /** 排序列表 */
      private List <Integer> sortList; private List <Integer> sortList;
      /** 填单的附件名称 */
      private List<String> fileNameList;
      /** 填单的附件下载地址 */
      private List<String> fileUrlList;
      /** 样表名称 */ /** 样表名称 */
      private List<String> sampleNameList; private List<String> sampleNameList;
      ...@@ -511,6 +517,36 @@ public class PubdatumQuery extends PubdatumEntity { ...@@ -511,6 +517,36 @@ public class PubdatumQuery extends PubdatumEntity {
      this.sortList = sortList; this.sortList = sortList;
      } }
      /**
      * 获取 填单的附件名称
      * @return fileNameList
      */
      public List<String> getFileNameList(){
      return this.fileNameList;
      }
      /**
      * 设置 填单的附件名称
      * @param fileNameList
      */
      public void setFileNameList(List<String> fileNameList){
      this.fileNameList = fileNameList;
      }
      /**
      * 获取 填单的附件下载地址
      * @return fileUrlList
      */
      public List<String> getFileUrlList(){
      return this.fileUrlList;
      }
      /**
      * 设置 填单的附件下载地址
      * @param fileUrlList
      */
      public void setFileUrlList(List<String> fileUrlList){
      this.fileUrlList = fileUrlList;
      }
      /** /**
      * 获取 样表名称 * 获取 样表名称
      * @return sampleNameList * @return sampleNameList
      ...@@ -1031,6 +1067,44 @@ public class PubdatumQuery extends PubdatumEntity { ...@@ -1031,6 +1067,44 @@ public class PubdatumQuery extends PubdatumEntity {
      } }
      /**
      * 设置 填单的附件名称
      * @param fileName
      */
      public PubdatumQuery fileName(String fileName){
      setFileName(fileName);
      return this;
      }
      /**
      * 设置 填单的附件名称
      * @param fileNameList
      */
      public PubdatumQuery fileNameList(List<String> fileNameList){
      this.fileNameList = fileNameList;
      return this;
      }
      /**
      * 设置 填单的附件下载地址
      * @param fileUrl
      */
      public PubdatumQuery fileUrl(String fileUrl){
      setFileUrl(fileUrl);
      return this;
      }
      /**
      * 设置 填单的附件下载地址
      * @param fileUrlList
      */
      public PubdatumQuery fileUrlList(List<String> fileUrlList){
      this.fileUrlList = fileUrlList;
      return this;
      }
      /** /**
      * 设置 样表名称 * 设置 样表名称
      * @param sampleName * @param sampleName
      ......
      fill-manager/src/main/resources/sqlmap/module/pubdatum/PubdatumMapper.xml
      View file @ 9b48b0b5
      ...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
      <result property="materiaFullName" column="materiaFullName" /> <result property="materiaFullName" column="materiaFullName" />
      <result property="total" column="total" /> <result property="total" column="total" />
      <result property="sort" column="sort" /> <result property="sort" column="sort" />
      <result property="fileName" column="fileName" />
      <result property="fileUrl" column="fileUrl" />
      <result property="sampleName" column="sampleName" /> <result property="sampleName" column="sampleName" />
      <result property="samplePath" column="samplePath" /> <result property="samplePath" column="samplePath" />
      <result property="templateName" column="templateName" /> <result property="templateName" column="templateName" />
      ...@@ -57,6 +59,12 @@ ...@@ -57,6 +59,12 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sort') or colPickMode == 1 and data.containsKey('sort')))">
      a.sort, a.sort,
      </if> </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>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileUrl') or colPickMode == 1 and data.containsKey('fileUrl')))">
      a.fileUrl,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sampleName') or colPickMode == 1 and data.containsKey('sampleName')))">
      a.sampleName, a.sampleName,
      </if> </if>
      ...@@ -89,18 +97,18 @@ ...@@ -89,18 +97,18 @@
      <!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="PubdatumEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="PubdatumEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_pubdatum insert into mortals_xhx_pubdatum
      (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
      VALUES VALUES
      (#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{total},#{sort},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime}) (#{matterId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{total},#{sort},#{fileName},#{fileUrl},#{sampleName},#{samplePath},#{templateName},#{templatePath},#{preViewPath},#{formContent},#{createTime},#{createUserId},#{updateTime})
      </insert> </insert>
      <!-- 批量新增 --> <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_pubdatum insert into mortals_xhx_pubdatum
      (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime) (matterId,deptId,deptCode,deptName,materialName,materiaFullName,total,sort,fileName,fileUrl,sampleName,samplePath,templateName,templatePath,preViewPath,formContent,createTime,createUserId,updateTime)
      VALUES VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.templateName},#{item.templatePath},#{item.preViewPath},#{item.formContent},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.matterId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{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})
      </foreach> </foreach>
      </insert> </insert>
      ...@@ -146,6 +154,12 @@ ...@@ -146,6 +154,12 @@
      <if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))"> <if test="(colPickMode==0 and data.containsKey('sortIncrement')) or (colPickMode==1 and !data.containsKey('sortIncrement'))">
      a.sort=ifnull(a.sort,0) + #{data.sortIncrement}, a.sort=ifnull(a.sort,0) + #{data.sortIncrement},
      </if> </if>
      <if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
      a.fileName=#{data.fileName},
      </if>
      <if test="(colPickMode==0 and data.containsKey('fileUrl')) or (colPickMode==1 and !data.containsKey('fileUrl'))">
      a.fileUrl=#{data.fileUrl},
      </if>
      <if test="(colPickMode==0 and data.containsKey('sampleName')) or (colPickMode==1 and !data.containsKey('sampleName'))"> <if test="(colPickMode==0 and data.containsKey('sampleName')) or (colPickMode==1 and !data.containsKey('sampleName'))">
      a.sampleName=#{data.sampleName}, a.sampleName=#{data.sampleName},
      </if> </if>
      ...@@ -264,6 +278,20 @@ ...@@ -264,6 +278,20 @@
      </choose> </choose>
      </foreach> </foreach>
      </trim> </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'))">
      when a.id=#{item.id} then #{item.fileName}
      </if>
      </foreach>
      </trim>
      <trim prefix="fileUrl=(case" suffix="ELSE fileUrl end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('fileUrl')) or (colPickMode==1 and !item.containsKey('fileUrl'))">
      when a.id=#{item.id} then #{item.fileUrl}
      </if>
      </foreach>
      </trim>
      <trim prefix="sampleName=(case" suffix="ELSE sampleName end),"> <trim prefix="sampleName=(case" suffix="ELSE sampleName end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))"> <if test="(colPickMode==0 and item.containsKey('sampleName')) or (colPickMode==1 and !item.containsKey('sampleName'))">
      ...@@ -614,6 +642,36 @@ ...@@ -614,6 +642,36 @@
      </if> </if>
      <if test="conditionParamRef.containsKey('fileName')">
      <if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
      ${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
      </if>
      <if test="conditionParamRef.fileName == null">
      ${_conditionType_} a.fileName is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('fileNameList')">
      ${_conditionType_} a.fileName in
      <foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('fileUrl')">
      <if test="conditionParamRef.fileUrl != null and conditionParamRef.fileUrl != ''">
      ${_conditionType_} a.fileUrl like #{${_conditionParam_}.fileUrl}
      </if>
      <if test="conditionParamRef.fileUrl == null">
      ${_conditionType_} a.fileUrl is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('fileUrlList')">
      ${_conditionType_} a.fileUrl in
      <foreach collection="conditionParamRef.fileUrlList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('sampleName')"> <if test="conditionParamRef.containsKey('sampleName')">
      <if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''"> <if test="conditionParamRef.sampleName != null and conditionParamRef.sampleName != ''">
      ${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName} ${_conditionType_} a.sampleName like #{${_conditionParam_}.sampleName}
      ...@@ -812,6 +870,16 @@ ...@@ -812,6 +870,16 @@
      <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if> <if test='orderCol.sort != null and "DESC".equalsIgnoreCase(orderCol.sort)'>DESC</if>
      , ,
      </if> </if>
      <if test="orderCol.containsKey('fileName')">
      a.fileName
      <if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('fileUrl')">
      a.fileUrl
      <if test='orderCol.fileUrl != null and "DESC".equalsIgnoreCase(orderCol.fileUrl)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('sampleName')"> <if test="orderCol.containsKey('sampleName')">
      a.sampleName a.sampleName
      <if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if> <if test='orderCol.sampleName != null and "DESC".equalsIgnoreCase(orderCol.sampleName)'>DESC</if>
      ......
      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