diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java index e70c9bb3..e8597c46 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/BusProcessEvaluationHis.java @@ -70,9 +70,21 @@ public class BusProcessEvaluationHis implements Serializable { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private String updateTime; + @ApiModelProperty(value = "onlyOffice 是否编辑 0 未编辑 1 已编辑") + @TableField("EDIT_STATUS") + private String editStatus; + + @ApiModelProperty(value = "onlyOffice 编辑文件存储路径") + @TableField("EDIT_FILE_PATH") + private String editFilePath; + @ApiModelProperty(value = "逻辑状态") @TableField("FLAG") private String flag; + @ApiModelProperty(value = "onlyOffice 访问编辑文件全路径") + @TableField(exist = false) + private String downLoadUrl; + } diff --git a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java index 34575906..e28415b7 100644 --- a/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java +++ b/adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java @@ -53,14 +53,14 @@ public class WaterMarkUtil { under.setGState(gs); under.restoreState(); under.beginText(); - under.setFontAndSize(base, 50); + under.setFontAndSize(base, 30); under.setTextMatrix(30, 30); under.setColorFill(BaseColor.LIGHT_GRAY); - for (int y = 0; y < 5; y++) { - for (int x = 0; x < 10; x++) { - // 水印文字成45度角倾斜 + for (int y = 0; y < 50; y++) { + for (int x = 0; x < 50; x++) { + // 水印文字成45度角倾斜 x位置 y位置 角度 under.showTextAligned(Element.ALIGN_LEFT - , waterMarkName, 100 + 300 * x, 300 * y, 40); + , waterMarkName, 40 + 120 * x, 100 * y, 40); } } diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 058ac857..492c5ea8 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -99,6 +99,6 @@ public class WebMvcConfig implements WebMvcConfigurer { // // 添加自定义拦截器，并拦截对应 url -// addInterceptor.addPathPatterns("/**"); + addInterceptor.addPathPatterns("/**"); } } 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/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java index c146dbf8..7bcab299 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/controller/QualityEvaluationController.java @@ -78,6 +78,7 @@ public class QualityEvaluationController extends BaseController evaluationForm = iQualityEvaluationService.getEvaluationForm(qualityEvaluation); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java index 2620c87d..6466e49a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/FormVO.java @@ -25,4 +25,7 @@ public class FormVO { @ApiModelProperty("评分类型") private String evaluationType; + + @ApiModelProperty("流程节点名称") + private String processNode; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java index 765241da..3b76d119 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/impl/QualityEvaluationServiceImpl.java @@ -72,7 +72,8 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getHistory(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); // Page page = new Page<>(query.getPage(), query.getPageSize()); - Page page = new Page<>(1, 20); + //没有page和pageSize无法分页 + Page page = new Page<>(1, 100000); if (query.getUserId()!=null){ //指定用户 @@ -84,6 +85,9 @@ public class QualityEvaluationServiceImpl extends ServiceImplDouble.valueOf(item.getScore()) )))); + Collectors.averagingDouble(item ->{ + + Double score; + switch (item.getProcessNode()){ + case "会签征求意见": + score=Double.valueOf(item.getScore()) * 0.3; + break; + case "技术委员会负责人/起草中心主任审核": + score=Double.valueOf(item.getScore()) * 0.4; + break; + case "标准法规工程师复审": + score=Double.valueOf(item.getScore()) * 0.3; + break; + case "标准法规部部长审核": + score=Double.valueOf(item.getScore()) * 0.3; + break; + default: score=Double.valueOf(item.getScore()); + } + + return score; + } )))); return result; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java index 51d19690..b8ce4322 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java @@ -28,12 +28,12 @@ public class IssueTrackController { @PutMapping() @ApiOperation("新增重点标准跟踪清单项目") public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){ - boolean b = issueTrackService.addIssueTrack(issueTrack); + int b = issueTrackService.addIssueTrack(issueTrack); - if (b){ - return Result.success("200","成功", true); + if (b>0){ + return Result.success("200","信息已存在,更新!", true); }else{ - return Result.error("100","数据不能相同", false); + return Result.error("100","新增成功!", false); } } @@ -63,7 +63,7 @@ public class IssueTrackController { if (b){ return Result.success("200","成功", true); }else{ - return Result.error("100","数据不能相同", false); + return Result.error("100","标准或政策已存在", false); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java index 3e3a492b..12cc0873 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java @@ -37,9 +37,9 @@ public class IssueTrack { @TableField("product_type") private String productType; - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-mm-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @TableField("impl_time") - private Date implTime; + private String implTime; @TableField("impl_require") private String implRequire; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java index 9324cbee..b51ad06b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/IIssueTrackService.java @@ -9,7 +9,7 @@ import java.util.Map; public interface IIssueTrackService { - public boolean addIssueTrack(IssueTrack obj); + public int addIssueTrack(IssueTrack obj); public boolean removeIssueTrack(List idList); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java index 1a3188f4..0563be7c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java @@ -25,14 +25,22 @@ public class IssueTrackServiceImpl extends ServiceImpl countWrapper = new QueryWrapper<>(); + countWrapper.eq("law_id",obj.getLawId()) + .eq("del_flag",0); + int count = this.count(countWrapper); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("law_id",obj.getLawId()); obj.setId(UUIDUtils.randomUUID20()); obj.setDelFlag("0"); + this.saveOrUpdate(obj,wrapper); - return this.saveOrUpdate(obj,wrapper); + + return count; } @@ -56,12 +64,13 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("law_id",obj.getLawId()); + wrapper.eq("law_id",obj.getLawId()) + .eq("del_flag","0") + .ne("id",obj.getId()); IssueTrack one = this.getOne(wrapper); - if (one==null){ + if (one!=null){ return false; }else { - obj.setId(UUIDUtils.randomUUID20()); obj.setDelFlag("0"); return this.updateById(obj); } 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/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index b39f1f1f..cf74720e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -184,7 +184,12 @@ public class TsResourceServiceImpl extends ServiceImpl TsResourceQueryWrapper=new QueryWrapper<>(); - TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); +// TsResourceQueryWrapper.like("PARENT_IDS",resource.getId()); + /** + * 没有把改节点查出 + */ + TsResourceQueryWrapper.isNotNull("PARENT_ID"); + if(StringUtils.isNotBlank(tsResource.getSorDivide())){ TsResourceQueryWrapper.in("ID",getMenuIdList); } @@ -323,7 +328,9 @@ public class TsResourceServiceImpl extends ServiceImpl */ private List recursionGetListChildrenStand(TsResource resource,List children){ - List tsResources = children.stream().filter(resource1 -> resource1.getParentId().equals(resource.getId())).collect(Collectors.toList()); + List tsResources = children.stream() + .filter(resource1 -> resource1.getParentId().equals(resource.getId())) + .collect(Collectors.toList()); if(!tsResources.isEmpty()){ tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); tsResources.forEach(resource1 -> { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 12b12d4e..0a90890a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -245,7 +245,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl { response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - List exportExcel = earlyWarningEOService.getExportExcel(excelVO); + List exportExcel = earlyWarningEOService.getExportExcel(excelVO); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") + EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") .doWrite(exportExcel); } catch (Exception e) { System.out.println(e); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java index 6bef46dd..618770a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandWarning.dao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; @@ -14,6 +15,6 @@ public interface EarlyWarningEODao extends BaseMapper { IPage selectWarningPage(IPage page, @Param("waringEO") StandWarningEO warningEO); - List exportWarning(@Param("idList") List ids); + List exportWarning(@Param("idList") List ids); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 9ad1b399..fec3d95e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandWarning.entity; import com.adc.da.base.entity.BaseEntity; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -47,17 +48,19 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standType; - @ExcelProperty("标准号") + @ExcelProperty(value = "标准编号",index = 1) + @ColumnWidth(20) @ApiModelProperty("标准号") @TableField(exist = false) private String standCode; - @ExcelProperty("标准名称") + @ExcelProperty(value = "标准名称",index = 2) + @ColumnWidth(40) @ApiModelProperty("标准名称") @TableField(exist = false) private String standName; - @ExcelProperty("发布日期") + @ExcelProperty(value = "发布日期",index = 5) @ApiModelProperty("发布日期") @TableField(exist = false) @DateTimeFormat(pattern="yyyy-MM-dd") @@ -67,12 +70,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private Date lastTime; - @ExcelProperty("适用车型") + @ExcelIgnore @ApiModelProperty("适用车型") @TableField(exist = false) private String applyType; - @ExcelProperty("责任工程师") + @ExcelIgnore @ApiModelProperty("责任工程师") @TableField(exist = false) private String dutyEngineer; @@ -82,12 +85,14 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsId; - @ExcelProperty("条款（分解单）编号") + @ExcelProperty(value = "条款编号",index = 3) + @ColumnWidth(20) @ApiModelProperty("条款（分解单）编号") @TableField(exist = false) private String itemsNum; - @ExcelProperty("条款（分解单）名称") + @ExcelProperty(value = "条款名称",index = 4) + @ColumnWidth(40) @ApiModelProperty("条款（分解单）名称") @TableField(exist = false) private String itemsName; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java new file mode 100644 index 00000000..db2f7b95 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -0,0 +1,40 @@ +package com.adc.da.slrs.sarStandWarning.entity; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WarningExportVO extends EarlyWarningEO { + + + + @ExcelProperty(value = "实施日期",index = 6) + @ColumnWidth(20) + @ApiModelProperty("实施日期") + private String SSRQ; + + + @ExcelProperty(value = "新车型实施日期",index = 7) + @ColumnWidth(20) + @ApiModelProperty("新车型实施日期") + private String XCXSSRQ; + + @ExcelProperty(value = "在产车实施日期",index = 8) + @ColumnWidth(20) + @ApiModelProperty("在产车实施日期") + private String ZCCSSRQ; + + @ExcelProperty(value = "类型",index = 0) + @ApiModelProperty("标准类别显示") + private String standTypeShow; + + @ExcelProperty(value = "适用车型",index = 9) + @ColumnWidth(20) + @ApiModelProperty("适用车型展示") + private String applyTypeShow; + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java index fea9090f..b5079d69 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/EarlyWarningEOService.java @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandWarning.service; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -22,5 +23,5 @@ public interface EarlyWarningEOService extends IService { IPage getStandWarning(StandWarningEO queryPage); - List getExportExcel(WarningExcelVO excelVO); + List getExportExcel(WarningExcelVO excelVO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java index 57569568..0b8f6f78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandWarning.dao.EarlyWarningEODao; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.adc.da.slrs.sarStandWarning.entity.StandWarningEO; import com.adc.da.slrs.sarStandWarning.entity.WarningExcelVO; +import com.adc.da.slrs.sarStandWarning.entity.WarningExportVO; import com.adc.da.slrs.sarStandWarning.service.EarlyWarningEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -120,8 +121,8 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl getExportExcel(WarningExcelVO excelVO){ - List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); + public List getExportExcel(WarningExcelVO excelVO){ + List standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds()); // IPage standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null); return standWarningEOList; 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/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml index 20dc0681..86929393 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarEnterpriseStandardEvalution/QualityEvaluationMapper.xml @@ -10,6 +10,7 @@ eva.user_id, `index`.value_type as valueType, eva.evaluation_type as evaluationType, + process_node as processNode, avg(eva.score * `index`.weight) AS score, min(eva.create_time) as createTiem, max(eva.modify_time) as modifyTime @@ -23,8 +24,9 @@ eva.user_id, index_type, valueType, - evaluationType - ORDER BY modifyTime DESC + evaluationType, + process_node + ORDER BY modifyTime DESC,process_node ASC @@ -38,6 +40,7 @@ score, reason, evaluation_index as evaluationIndex, + process_node as processNode, quality_evaluation.create_time AS createTime, quality_evaluation.modify_time AS modifyTime, `index`.value_type AS valueType, 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}) + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml index fdc9655e..1e2ee222 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml @@ -38,8 +38,6 @@ - - AND trim(replace(CONCAT( sarInfo.STAND_SORT, @@ -74,18 +72,35 @@ ) - SELECT WARNING_RESULT.* FROM ( SELECT - - , - attr.CLLX AS - APPLY_TYPE , - attr - .ZRGCS AS DUTY_ENGINEER , + , + dicType.DIC_TYPE_NAME AS applyTypeShow, + attr.CLLX AS APPLY_TYPE , + attr.ZRGCS AS DUTY_ENGINEER , NULL AS ITEMS_ID , NULL AS ITEMS_NUM , NULL AS ITEMS_NAME , NULL AS POLICY_ID , @@ -97,6 +112,7 @@ FROM sar_stand_warning AS warning LEFT JOIN sar_standards_info AS sarInfo on sarInfo.id=warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr on attr.STAND_ID=warning.STAND_ID + LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =attr.CLLX POWER = '1' AND (MARK = 'stand') @@ -116,7 +132,8 @@ UNION ALL SELECT - , + , + dicType.DIC_TYPE_NAME AS applyTypeShow, items.APPLY_ARCTIC AS APPLY_TYPE , items.DUTY_ENGINEER AS DUTY_ENGINEER , items.ID AS ITEMS_ID , @@ -133,6 +150,7 @@ LEFT JOIN sar_standards_info AS sarInfo ON sarInfo.id = warning.STAND_ID LEFT JOIN sar_stand_items AS items ON items.STAND_ID = warning.STAND_ID LEFT JOIN sar_stand_attr_info AS attr ON attr.STAND_ID = warning.STAND_ID + LEFT JOIN ts_dictype as dicType on dicType.DIC_TYPE_CODE =items.APPLY_ARCTIC POWER = '1' AND (MARK = 'item')