From 3e877d48fe59d3b71a6cee847bc20233f4c0dd1b Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 6 Dec 2021 14:06:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 15 +++++++++++---- .../controller/SarStandardsInfoController.java | 16 ++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index fa91fe23..575f096e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController @RequestMapping("/${restPath}/sys/EarlyWarning") @@ -66,6 +63,16 @@ public class EarlyWarningEOController extends BaseController { @ApiOperation("标准预警查询") public ResponseMessage> getStandWaring(StandWarningEO queryPageEO){ IPage standWarning = earlyWarningEOService.getStandWarning(queryPageEO); + standWarning.getRecords().forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); return Result.success(standWarning); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index d6e5d118..17084c8b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -46,6 +46,7 @@ import java.net.URLEncoder; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** *

@@ -110,9 +111,24 @@ public class SarStandardsInfoController extends BaseController page.setUserId(LoginUserUtil.getUserId()); } List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); + +// 去掉日期时分秒 + rows.forEach(item->{ + + Optional.ofNullable(item.getSSRQ()) + .ifPresent(SSRQ -> item.setSSRQ(item.getSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getXCXSSRQ()) + .ifPresent(SSRQ ->item.setXCXSSRQ(item.getXCXSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + Optional.ofNullable(item.getZCCSSRQ()) + .ifPresent(SSRQ ->item.setZCCSSRQ(item.getZCCSSRQ().replaceAll("\\s[0-6][0-9]\\:[0-6][0-9]\\:[0-6][0-9]", ""))); + + }); + return Result.success(getPageInfo(page.getPager(), rows)); } + + private void nowOrderFunc(SarStandardsInfoEOPage page) { switch (page.getNowOrderBy()) { case 1: From 8d211a52c238bed14fd0960ed00c78da6d8b6bf9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 6 Dec 2021 18:03:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityEvaluationController.java | 49 +++++++--------- .../entity/FormVO.java | 14 ++++- .../entity/QualityEvaluation.java | 10 +++- .../service/IQualityEvaluationService.java | 3 +- .../impl/QualityEvaluationServiceImpl.java | 56 +++++++++++++------ .../service/impl/IssueTrackServiceImpl.java | 15 ++--- .../QualityEvaluationMapper.xml | 28 +++++----- 7 files changed, 101 insertions(+), 74 deletions(-) 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 f887166c..22621812 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 @@ -41,41 +41,30 @@ public class QualityEvaluationController extends BaseController tableData = form.getTableData(); - String standId = form.getStandId(); - String userId = form.getUserId(); - tableData.forEach(item->{ - item.setUserId(userId); - item.setLawId(standId); - if ( item.getEvaluationIndex()!=null && "3U9lb".equals( item.getEvaluationIndex() ) ){ + if (form.getFormData()!=null && !form.getFormData().isEmpty()){ + List tableData = form.getTableData(); + String lawId = form.getLawId(); + String userId = form.getUserId(); + tableData.forEach(item->{ + item.setUserId(userId); + item.setLawId(lawId); - JSONObject jsonObject = JSONObject.parseObject(form.getFormData()); -// switch (item.getScore()){ -// case "0": -// item.setScore("-1"); -// case "1": -// item.setScore("-2"); -// } - item.setScore(jsonObject.getString("revise")); - item.setReason(jsonObject.getString("reviseReason")); + if ( item.getEvaluationIndex()!=null && "3U9lb".equals( item.getEvaluationIndex() ) ){ - } + JSONObject jsonObject = JSONObject.parseObject(form.getFormData()); + item.setScore(jsonObject.getString("revise")); + item.setReason(jsonObject.getString("reviseReason")); - }); + } -// -// Optional.ofNullable(item.getEvaluationIndex()) -// .map(u-> { -// -// return null; -// }) -// .map(a-> { -// -// }).orElseThrow(()->new Exception("取指错误")); + }); + } - Boolean i = iQualityEvaluationService.submitEvaluationForm(tableData); + + + Boolean i = iQualityEvaluationService.submitEvaluationForm(form); return Result.success(i); } @@ -85,7 +74,11 @@ public class QualityEvaluationController extends BaseController tableData; - private String standId; + @ApiModelProperty("企标法规id") + @JsonProperty("standId") //前后分离 前端字段 + private String lawId; + @ApiModelProperty("提交的用户id") private String userId; - + @ApiModelProperty("附加") private String formData; + + @ApiModelProperty("评分类型") + private String evaluationType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java index 4105fc37..ddcb4919 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/entity/QualityEvaluation.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.time.LocalDateTime; import java.util.Date; /** @@ -53,7 +54,7 @@ public class QualityEvaluation extends BaseEntity { @JsonProperty("indexType") //前后分离 前端字段 @TableField("evaluation_type") - @ApiModelProperty(value = "评价类型") + @ApiModelProperty(value = "评分类型") private String evaluationType; @JsonProperty("commentReason") //前后分离 前端字段 @@ -66,6 +67,9 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "打分") private String score; + @ApiModelProperty(value = "指标值类型") + @TableField(exist = false) + private String valueType; @TableField("process_node") @ApiModelProperty(value = "流程节点") @@ -73,11 +77,11 @@ public class QualityEvaluation extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) - private Date createTime; + private LocalDateTime createTime; @ApiModelProperty(value = "更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) - private Date modifyTime; + private LocalDateTime modifyTime; @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java index cc78ae4f..c4984665 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarEnterpriseStandardEvaluation/service/IQualityEvaluationService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -17,7 +18,7 @@ import java.util.Map; */ public interface IQualityEvaluationService extends IService { - public Boolean submitEvaluationForm(List form); + public Boolean submitEvaluationForm(FormVO form); public IPage getHistory(QualityEvaluation query); 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 60e3b745..b068eff1 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.impl; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.EvaluationIndex; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.FormVO; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; import com.adc.da.slrs.sarEnterpriseStandardEvaluation.service.IEvaluationIndexService; @@ -10,14 +11,12 @@ 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.apache.commons.collections.IterableMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.PipedReader; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.stream.Collector; import java.util.stream.Collectors; @@ -38,20 +37,41 @@ public class QualityEvaluationServiceImpl extends ServiceImpl form) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + public Boolean submitEvaluationForm(FormVO form) { + // // queryWrapper.eq("user_id",form.get) // .eq("evaluation_type","dynamic"); - this.remove(queryWrapper); - form.forEach(item->item.setId( UUIDUtils.randomUUID20())); - return this.saveBatch(form); + + Optional.ofNullable(form.getEvaluationType()) + .ifPresent( item->{ + if ("dynamic".equals(form.getEvaluationType())){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("law_id",form.getLawId()) //清除此用户在动态评分中已存在的评分 + .eq("user_id",form.getUserId()) + .eq("evaluation_type","dynamic"); + this.remove(queryWrapper); + } + }); + + + List tableData = form.getTableData(); + tableData.forEach(item->{ + + item.setId( UUIDUtils.randomUUID20()); + if ("number".equals(item.getValueType()) ){ + item.setScore(String.valueOf (Double.valueOf(item.getScore()) * 2) ); + + } + }); + return this.saveBatch(tableData); } @Override public IPage getHistory(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); - Page page = new Page<>(query.getPage(), query.getPageSize()); +// Page page = new Page<>(query.getPage(), query.getPageSize()); + Page page = new Page<>(1, 20); if (query.getUserId()!=null){ //指定用户 @@ -63,6 +83,7 @@ public class QualityEvaluationServiceImpl extends ServiceImpl getEvaluationForm(QualityEvaluation query) { QueryWrapper queryWrapper = new QueryWrapper<>(); - Page page = new Page<>(query.getPage(), query.getPageSize()); - queryWrapper.select("UNAME as userName","score","reason","create_time","modify_time") - .eq("law_id",query.getLawId()) //企标id - .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID"); + queryWrapper.select("UNAME as userName","score","reason","create_time as createTime","modify_time as modifyTime","idx.value_type as valueType") + .last("JOIN ts_user user ON quality_evaluation.user_id = user.USID" + + "LEFT JOIN evaluation_index as idx on iex.id=quality_evaluation.evaluation_index"); + if (query.getLawId()!=null){ + queryWrapper.eq("law_id",query.getLawId()); //指定企标id + } + if (query.getUserId()!=null){ //指定用户 - queryWrapper.eq("user_id", query.getUserId()) - .orderBy(true,true, "crate_time","modify_time"); + queryWrapper.eq("quality_evaluation.user_id", query.getUserId()); + } if (query.getEvaluationType()!=null){ //指定评价指标 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 bca0fb71..1a3188f4 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 @@ -27,17 +27,12 @@ public class IssueTrackServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq("law_id",obj.getLawId()) - .eq("del_flag","0"); + wrapper.eq("law_id",obj.getLawId()); - IssueTrack one = this.getOne(wrapper); - if (one==null){ - return false; - }else { - obj.setId(UUIDUtils.randomUUID20()); - obj.setDelFlag("0"); - return this.save(obj); - } + obj.setId(UUIDUtils.randomUUID20()); + obj.setDelFlag("0"); + + return this.saveOrUpdate(obj,wrapper); } 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 c166cfe4..2c134c8c 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 @@ -5,20 +5,20 @@ From a2d002d65970c61b1a749ada1fee62b30b083cfc Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 6 Dec 2021 18:06:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ocr=E5=9B=9E=E5=88=B0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=96=9C=E6=9D=A0=E8=BD=AC=E6=8D=A2=EF=BC=8C?= =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=80=A0=E6=88=90=E8=B7=AF=E5=BE=84=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index c79bdc83..90dad375 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -161,7 +161,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String saveWordFileName=null; logger.info("将文件保存至本地"); if(wordFile!=null && !wordFile.isEmpty()){ - saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename(); + saveWordFileName=UUIDUtils.randomUUID20()+"_"+wordFile.getOriginalFilename().replace("/","_"); saveWordFilePath=ocrFilePath+saveWordFileName; logger.info(saveWordFilePath); //生成保存文件 @@ -175,12 +175,12 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { String saveJsonFilePath=null; String saveJsonFileName=null; if(jsonFile!=null && !jsonFile.isEmpty()){ - saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename(); + saveJsonFileName=UUIDUtils.randomUUID20()+"_"+jsonFile.getOriginalFilename().replace("/","_"); saveJsonFilePath=ocrFilePath+saveJsonFileName; logger.info(saveJsonFilePath); File saveJsonFile = new File(saveJsonFilePath); System.out.println(saveJsonFile); - wordFile.transferTo(saveJsonFile); + jsonFile.transferTo(saveJsonFile); // FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); // savePic(jsonFile.getInputStream(),saveJsonFilePath); logger.info("Json存储完成");