diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
index 8e9a93ae..6a4b9032 100644
--- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
+++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
@@ -18,13 +18,13 @@ public class CodeGen {
private static final String PACKAGE_PATH="/adc-da-slrs/src/main";
- private static final String AUTHOR="super_liu";
+ private static final String AUTHOR="zhaokaiyao";
- private static final String DB_IP="127.0.0.1:3306/foton_slrs_test";
+ private static final String DB_IP="123.56.177.15:3306/foton_slrs_test2";
private static final String DB_USER="root";
- private static final String DB_PWD="root";
+ private static final String DB_PWD="RsLDRj3dXtSwYjBI";
/**
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
new file mode 100644
index 00000000..f1dc2bd1
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/controller/FileMaterialController.java
@@ -0,0 +1,92 @@
+package com.adc.da.slrs.fileMaterialCenter.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage;
+import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zhaokaiyao
+* @since 2021-12-14
+*/
+@RestController
+@Api(description = "资料中心")
+@RequestMapping("/fileMaterialCenter/file-material")
+public class FileMaterialController extends BaseController {
+
+ @Autowired
+ IFileMaterialService iFileMaterialService;
+
+ @PostMapping
+ @ApiOperation("新增文件资料组")
+ public ResponseMessage addFileMaterial(FileMaterial material){
+ boolean save = iFileMaterialService.save(material);
+
+ return Result.success(save);
+ }
+
+
+ @DeleteMapping
+ @ApiOperation("删除文件资料组")
+ public ResponseMessage deleteMaterial(String id){
+ List idList = Arrays.asList(id.split(id));
+ boolean b = iFileMaterialService.removeByIds(idList);
+
+ return Result.success(b);
+
+ }
+
+
+ @GetMapping
+ @ApiOperation("查询文件资料组")
+ public ResponseMessage> getFileMaterial(FileMaterialPage queryPage){
+ IPage fileMaterial = iFileMaterialService.getFileMaterial(queryPage);
+
+ return Result.success(fileMaterial);
+ }
+
+
+ @PutMapping
+ @ApiOperation("修改文件资料组")
+ public ResponseMessage updateFileMaterial(FileMaterial fileMaterial){
+ boolean b = iFileMaterialService.updateById(fileMaterial);
+
+ return Result.success(b);
+ }
+
+
+ @GetMapping("/type")
+ @ApiOperation("获取类型")
+ public ResponseMessage> getFileMaterialType(){
+ List fileMaterialType = iFileMaterialService.getFileMaterialType();
+
+ return Result.success(fileMaterialType);
+ }
+
+ @PutMapping("/topping")
+ @ApiModelProperty("置顶")
+ public ResponseMessage topping(String id){
+ int topping = iFileMaterialService.topping(id);
+
+ return Result.success(topping);
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java
new file mode 100644
index 00000000..7fb80943
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/dao/FileMaterialDao.java
@@ -0,0 +1,19 @@
+package com.adc.da.slrs.fileMaterialCenter.dao;
+
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zhaokaiyao
+ * @since 2021-12-14
+ */
+public interface FileMaterialDao extends BaseMapper {
+
+
+ int topping(@Param("id") String id);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
new file mode 100644
index 00000000..ec068ebc
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterial.java
@@ -0,0 +1,61 @@
+package com.adc.da.slrs.fileMaterialCenter.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.Tag;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zhaokaiyao
+ * @since 2021-12-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="FileMaterial对象", description="")
+public class FileMaterial extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId
+ @ApiModelProperty(value = "主键")
+ private String id;
+
+ @ApiModelProperty(value = "类型")
+ @TableField("data_type")
+ private String dataType;
+
+ @ApiModelProperty(value = "标题")
+ @TableField("data_title")
+ private String dataTitle;
+
+ @ApiModelProperty(value = "上传时间")
+ @TableField("data_upload_time")
+ private Date dataUploadTime;
+
+ @ApiModelProperty(value = "文件id")
+ @TableField("attach_file_id")
+ private String attachFileId;
+
+
+ @ApiModelProperty(value = "点击量")
+ @TableField("click_count")
+ private Integer clickCount;
+
+
+ @ApiModelProperty(value = "置顶")
+ @TableField("is_top")
+ private Integer isTop;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java
new file mode 100644
index 00000000..f99ac329
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/entity/FileMaterialPage.java
@@ -0,0 +1,23 @@
+package com.adc.da.slrs.fileMaterialCenter.entity;
+
+import lombok.Data;
+
+/**
+ * @author zhaokaiyao
+ */
+@Data
+public class FileMaterialPage {
+
+ private String dataTitle;
+
+ private String dataType;
+
+ private String startDataUploadTime;
+
+ private String endDataUploadTime;
+
+
+ private Integer page;
+
+ private Integer pageSize;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java
new file mode 100644
index 00000000..2007711c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/IFileMaterialService.java
@@ -0,0 +1,44 @@
+package com.adc.da.slrs.fileMaterialCenter.service;
+
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial;
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import javafx.scene.paint.Material;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zhaokaiyao
+ * @since 2021-12-14
+ */
+public interface IFileMaterialService extends IService {
+
+
+ /**
+ * 查询文件资料组
+ * @param queryPage
+ * @return
+ */
+ IPage getFileMaterial(FileMaterialPage queryPage);
+
+
+ /**
+ * 获取类型
+ * @return
+ */
+ List getFileMaterialType();
+
+ /**
+ * 置顶
+ * @param id
+ * @return
+ */
+ int topping(String id);
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
new file mode 100644
index 00000000..f9b159c5
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/fileMaterialCenter/service/impl/FileMaterialServiceImpl.java
@@ -0,0 +1,71 @@
+package com.adc.da.slrs.fileMaterialCenter.service.impl;
+
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterial;
+import com.adc.da.slrs.fileMaterialCenter.dao.FileMaterialDao;
+import com.adc.da.slrs.fileMaterialCenter.entity.FileMaterialPage;
+import com.adc.da.slrs.fileMaterialCenter.service.IFileMaterialService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.management.Query;
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zhaokaiyao
+ * @since 2021-12-14
+ */
+@Service
+public class FileMaterialServiceImpl extends ServiceImpl implements IFileMaterialService {
+
+ @Autowired
+ FileMaterialDao fileMaterialDao;
+
+
+ @Override
+ public IPage getFileMaterial(FileMaterialPage queryPage) {
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+
+ if (queryPage.getDataType()!=null){
+ queryWrapper.eq("data_type",queryPage.getDataTitle());
+ }
+
+ if (queryPage.getDataTitle()!=null){
+ queryWrapper.like("data_title",queryPage.getDataTitle());
+ }
+
+ if (queryPage.getStartDataUploadTime()!=null && queryPage.getEndDataUploadTime()!=null){
+
+
+ String strDateFormat = "yyyy-MM-dd HH:mm:ss";
+ SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
+ queryWrapper.between("data_upload_time",
+ sdf.format(queryPage.getStartDataUploadTime()),
+ sdf.format(queryPage.getEndDataUploadTime()));
+ }
+
+ return this.page(new Page<>(queryPage.getPage(),queryPage.getPageSize()),queryWrapper);
+ }
+
+ @Override
+ public List getFileMaterialType() {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+
+ queryWrapper.select("data_type");
+ return this.listObjs(queryWrapper, item -> item.toString());
+ }
+
+ @Override
+ public int topping(String id) {
+ return fileMaterialDao.topping(id);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
index bdb440df..b57b589e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/controller/SarLawsStandInfoController.java
@@ -194,6 +194,8 @@ public class SarLawsStandInfoController extends BaseController
@GetMapping(value = "/exportStandardsInfoExcel")
public void exportStandardsInfoExcel(String exportContent, String exportType, String exportName,String userId, HttpServletResponse response,
HttpServletRequest request) throws Exception {
+ List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId);
+
OutputStream os = null;
Workbook workbook = null;
try {
@@ -204,7 +206,7 @@ public class SarLawsStandInfoController extends BaseController
"attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request));
response.setContentType("application/force-download");
// 导出所有数据
- List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId);
+// List data = sarLawsInfoEOService.getExportData(exportType,exportContent,userId);
workbook = LawsStandExportUtil.exportDatas(data);
os = response.getOutputStream();
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
new file mode 100644
index 00000000..883a0e98
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ UPDATE file_material
+ SET is_top = (
+ (
+ SELECT
+ Max(is_top)
+ FROM
+ (SELECT * FROM file_material) AS x
+ ) + 1
+ )
+ WHERE
+ id = #{id}
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml
new file mode 100644
index 00000000..523a9b7f
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/materialCerter/MaterialMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
index bb2d5470..6c9f406d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
@@ -283,7 +283,7 @@
parameterType="com.adc.da.slrs.sarLawsStandInfo.entity.SarLawsStandInfoPage">
select
DISTINCT SAR_LAWS_STAND_INFO.ID,
- SAR_LAWS_STAND_INFO.LAWS_TYPE,
+ laws_type_show.DIC_TYPE_NAME as LAWS_TYPE,
SAR_LAWS_STAND_INFO.LAWS_NUMBER,
SAR_LAWS_STAND_INFO.LAWS_NAME,
SAR_LAWS_STAND_INFO.LAWS_EN_NAME,
@@ -293,8 +293,8 @@
SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START,
SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END,
SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE,
- SAR_LAWS_STAND_INFO.LAWS_SYQY,
- SAR_LAWS_STAND_INFO.LAWS_SYCX,
+ laws_sycx_show.DIC_TYPE_NAME as LAWS_SYCX,
+ laws_syqy_show.DIC_TYPE_NAME as LAWS_SYQY,
SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS,
SAR_LAWS_STAND_INFO.LAWS_YEAR,
SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM,
@@ -305,7 +305,7 @@
SAR_LAWS_STAND_INFO.MODIFY_TIME,
dicstandTextStatus.DIC_TYPE_NAME AS standStatusShow
from SAR_LAWS_STAND_INFO
-
+
order by
${orderByA} ${order1},
@@ -313,4 +313,133 @@
SAR_LAWS_STAND_INFO.id
+
+
+ left join SAR_LAWS_MENU ON SAR_LAWS_STAND_INFO.id = SAR_LAWS_MENU.laws_id
+ LEFT JOIN TS_DICTYPE dicstandTextStatus ON (
+ dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE
+ AND dicstandTextStatus.dic_id IS NOT NULL
+ AND dicstandTextStatus.valid_flag = 0
+ )
+
+ LEFT JOIN TS_DICTYPE laws_sycx_show ON (
+ dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYCX
+ AND dicstandTextStatus.dic_id IS NOT NULL
+ AND dicstandTextStatus.valid_flag = 0
+ )
+
+ LEFT JOIN TS_DICTYPE laws_syqy_show ON (
+ dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_SYQY
+ AND dicstandTextStatus.dic_id IS NOT NULL
+ AND dicstandTextStatus.valid_flag = 0
+ )
+
+ LEFT JOIN TS_DICTYPE laws_type_show ON (
+ dicstandTextStatus.dic_type_code = SAR_LAWS_STAND_INFO.LAWS_TYPE
+ AND dicstandTextStatus.dic_id IS NOT NULL
+ AND dicstandTextStatus.valid_flag = 0
+ )
+ left join SAR_LAWS_ATTR_INFO on (SAR_LAWS_ATTR_INFO.LAWS_ID = SAR_LAWS_STAND_INFO.id and SAR_LAWS_ATTR_INFO.valid_flag=0)
+ where 1=1 and SAR_LAWS_STAND_INFO.valid_flag=0
+
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_TYPE like concat(concat('%',#{lawsType}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%')
+
+
+ and (LAWS_NAME like concat(concat('%',#{numberName}),'%')
+ or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%'))
+
+
+ and LAWS_NAME like concat(concat('%',#{lawsName}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{lawsEnName}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_NO like concat(concat('%',#{lawsNo}),'%')
+
+
+ and DATE_FORMAT(SAR_LAWS_STAND_INFO.ISSUE_TIME,'%Y-%m-%d') = #{issueTime}
+
+
+ and SAR_LAWS_STAND_INFO.ISSUE_COMPANY like concat(concat('%',#{issueCompany}),'%')
+
+
+ and DATE_FORMAT(SAR_LAWS_STAND_INFO.COMMENT_CYCLE_START ,'%Y-%m-%d') = DATE_FORMAT(#{commentCycleStart},'%Y-%m-%d')
+
+
+ and DATE_FORMAT(SAR_LAWS_STAND_INFO.COMMENT_CYCLE_END ,'%Y-%m-%d') = DATE_FORMAT(#{commentCycleEnd},'%Y-%m-%d')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_TEXT_STATE = #{lawsTextState}
+
+
+ and FIND_IN_SET(#{lawsSyqy},SAR_LAWS_STAND_INFO.LAWS_SYQY)
+
+
+ and FIND_IN_SET(#{lawsSycx},SAR_LAWS_STAND_INFO.LAWS_SYCX)
+
+
+ and SAR_LAWS_STAND_INFO.IS_RELATE_ACCESS = #{isRelateAccess}
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_YEAR like concat(concat('%',#{lawsYear}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_NOTISYNC_NUM like concat(concat('%',#{lawsNotisyncNum}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_BULLETIN like concat(concat('%',#{lawsBulletin}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_LABEL like concat(concat('%',#{lawsLabel}),'%')
+
+
+ and SAR_LAWS_STAND_INFO.LAWS_REMARK like concat(concat('%',#{lawsRemark}),'%')
+
+
+
+ and SAR_LAWS_STAND_INFO.country = #{country}
+
+
+
+ and SAR_LAWS_MENU.MENU_ID in
+
+ #{item}
+
+
+
+
+
+ and SAR_LAWS_MENU.MENU_ID in
+
+ #{item}
+
+
+
+
+ and SAR_LAWS_STAND_INFO.id in
+
+ #{item}
+
+
+
+
+
+ and SAR_LAWS_STAND_INFO.id in (
+ select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0
+ and (collect_type='INLAND_STAND' or collect_type='FOREIGN_STAND')
+ and TS_PERSON_COLLECT.user_id=#{userId}
+ )
+
+
+
+ and (${advanceSearchStr})
+
+
+