From 91e26a51c585dd063fc0380978d8dc84f5a538d6 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 13 Oct 2022 11:06:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/processModel/exportWkExcel.java | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java index 53043a1e..8d8b9259 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java @@ -11,6 +11,7 @@ import com.adc.da.sys.service.IDicTypeEOService; import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; +import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -52,9 +53,10 @@ public class exportWkExcel { ExportParams exportParams = new ExportParams(); exportParams.setType(ExcelType.HSSF); exportParams.setSheetName(exportName); - List types=new ArrayList<>(); - types.add("BUSSSTANDCLASS"); - Map dicTypeEO = dicTypeEOService.getDicTypeListCodeByType(types); +// List types=new ArrayList<>(); +// types.add("BUSSSTANDCLASS"); +// Map dicTypeEO = dicTypeEOService.getDicTypeListCodeByType(types); + Map dicTypeEO = getBussStandTypeData(); workbook = ExcelExportUtilByWk.getHSSFWorkbook(exportParams, exportExcel.class,workbook,"1",dicTypeEO); os = response.getOutputStream(); workbook.write(os); @@ -66,6 +68,24 @@ public class exportWkExcel { } } + /** + * 静态加载企标类别下拉框 + * @return + */ + private static Map getBussStandTypeData(){ + Map resultMap = new HashMap<>(); + List> bussStandTypeList = new ArrayList<>(); + char letter = 'A'; + for(letter = 'A'; letter <= 'Z'; ++letter){ + Map typeMap = new HashMap<>(); + typeMap.put("Q/FT "+letter,"Q/FT "+letter); + bussStandTypeList.add(typeMap); + } + resultMap.put("BUSSSTANDCLASS",bussStandTypeList); + return resultMap; + } + + @ApiOperation(value = "|SarFileSplitItemsEO|导入") @PostMapping(value = "/importData") public ResponseMessage importSplitItemsZip(@RequestParam(value = "importFileId", required = false) String importFileId) throws Exception { From 61e8851ebf8186f362200315e18d2b99f6912f39 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 13 Oct 2022 13:51:54 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E6=B5=81?= =?UTF-8?q?=E7=A8=8B,=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActSarItemsBussEOController.java | 73 ++++++++++++++++++- .../adc/da/login/security/WebMvcConfig.java | 2 + 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java index f203eda4..b7628543 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/ActSarItemsBussEOController.java @@ -5,14 +5,23 @@ import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.adc.da.workFlow.entity.GetQBZXDExcelDto; import com.adc.da.workFlow.service.ActSarItemsBussEOService; -import com.adc.da.workFlow.service.ActSarItemsLawsEOService; +import com.alibaba.excel.EasyExcel; +import com.alibaba.fastjson.JSON; +import com.google.common.collect.Lists; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; +import java.util.*; +import java.util.stream.Collectors; + @RestController @RequestMapping("/${restPath}/lawss/actSarItemsBuss") @Api(description = "|ActSarItemsBuss|") @@ -50,4 +59,66 @@ public class ActSarItemsBussEOController extends BaseController { public void autoUpdIndex(@RequestParam("pid") String pid,@RequestParam("bussId") String bussId) { actSarItemsEOService.autoUpdIndex(pid,bussId); } + + @ApiOperation(value = "导出全部意见-企标制修订-技术标准-起草单位高级经理审核节点") + @PostMapping("/exportAllBZZXDJSBZ") + public void getAllStandYJCL(HttpServletResponse response, @RequestBody Map params){ + try { + net.sf.json.JSONArray jsonArray = net.sf.json.JSONArray.fromObject(params.get("json")); + List> data = (List>) jsonArray; + + response.setContentType("application/vnd.ms-excel"); + response.setCharacterEncoding("utf-8"); + String textName="意见信息"; + + Map map=new HashMap<>(); + map.put("1","采纳"); + map.put("2","部分采纳"); + map.put("3","不采纳"); + String fileName = URLEncoder.encode(textName, "UTF-8").replaceAll("\\+", "%20"); + response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); + + data = data.stream().sorted(Comparator.comparing(m->m.get("modelNum"))).collect(Collectors.toList()); + List standExcel=new ArrayList<>(); + int i=0; + for (Map idea : data){ + i++; + GetQBZXDExcelDto getExcelDto = GetQBZXDExcelDto.builder() + .partCode(idea.get("modelNum")) + .oldText(idea.get("modelUpdBefore")) + .newText(idea.get("modelUpdAfter")) + .reason(idea.get("modelContent")) + .userName(idea.get("zrUserIdName")) + .deptName(idea.get("zrDeptIdName")) + .state(map.get(idea.get("opinionsAdopted"))) + .cause(idea.get("opinionsAdoptedCont")) + .num(String.valueOf(i)) + .build(); + standExcel.add(getExcelDto); + } + + List> headList=new ArrayList>(); + headList.add(Lists.newArrayList("序号")); + headList.add(Lists.newArrayList("条款号")); + headList.add(Lists.newArrayList("修改前")); + headList.add(Lists.newArrayList("修改后")); + headList.add(Lists.newArrayList("修改理由")); + headList.add(Lists.newArrayList("提出部门")); + headList.add(Lists.newArrayList("责任人")); + headList.add(Lists.newArrayList("意见是否采纳")); + headList.add(Lists.newArrayList("采纳原因")); + EasyExcel.write(response.getOutputStream(), GetQBZXDExcelDto.class).head(headList).autoCloseStream(Boolean.FALSE).sheet("sheet1") + .doWrite(standExcel); + + } catch (Exception e) { + response.reset(); + response.setContentType("application/json"); + response.setCharacterEncoding("utf-8"); + try { + response.getWriter().println(JSON.toJSONString(Result.error())); + } catch (IOException ioException) { + ioException.printStackTrace(); + } + } + } } 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 9fc0eb38..22da1a26 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 @@ -73,6 +73,8 @@ public class WebMvcConfig implements WebMvcConfigurer { //从excl中导入标准 addInterceptor.excludePathPatterns("/api/ImportExcel/import"); + //企标制修订-技术标准 意见导出 + addInterceptor.excludePathPatterns("/api/lawss/actSarItemsBuss/exportAllBZZXDJSBZ"); //标准征求意见导出 addInterceptor.excludePathPatterns("/api/slrs/sar-public-idea-all/tuallStand"); // 标准征求意见流程意见导出 From bb8021122e096422803dc1a1f8def49fae8df3e9 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 13 Oct 2022 14:57:51 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E6=B5=81?= =?UTF-8?q?=E7=A8=8B,=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=BB=8F=E7=90=86=E5=AE=A1=E6=A0=B8=E8=8A=82=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/workFlow/entity/GetQBZXDExcelDto.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/GetQBZXDExcelDto.java diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/GetQBZXDExcelDto.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/GetQBZXDExcelDto.java new file mode 100644 index 00000000..eb600cb3 --- /dev/null +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/entity/GetQBZXDExcelDto.java @@ -0,0 +1,35 @@ +package com.adc.da.workFlow.entity; + +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@HeadRowHeight(20) +@ColumnWidth(15) +public class GetQBZXDExcelDto { + private String num; // 序号 + + private String partCode; // 条款号 + + private String oldText; // 修改前 + + private String newText; // 修改后 + + private String reason; // 修改理由 + + private String deptName; // 提出部门 + + private String userName; // 责任人 + + private String state; // 意见是否采纳 + + private String cause; // 采纳理由 + +} From 12635bbdc4a9e14201d98679d5048c76491ccc09 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 13 Oct 2022 18:09:17 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=94=99=E8=AF=AF=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 3 +- .../impl/SarStandardsInfoServiceImpl.java | 3 +- .../adc/da/utils/util/EncryptFileUtils.java | 43 +++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 11bbe3e5..369af477 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -1844,6 +1844,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Fri, 14 Oct 2022 10:46:20 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 42 ++++++++- .../controller/EsRevisePlanLogController.java | 42 +++++++++ .../esRevisePlan/dao/EsRevisePlanLogDao.java | 19 ++++ .../esRevisePlan/entity/EsRevisePlan.java | 14 +++ .../esRevisePlan/entity/EsRevisePlanLog.java | 42 +++++++++ .../entity/EsRevisePlanLogForm.java | 12 +++ .../service/IEsRevisePlanLogService.java | 23 +++++ .../impl/EsRevisePlanLogServiceImpl.java | 87 +++++++++++++++++++ .../service/impl/EsRevisePlanServiceImpl.java | 21 ++++- .../esRevisePlan/EsRevisePlanLogMapper.xml | 19 ++++ .../esRevisePlan/EsRevisePlanMapper.xml | 5 ++ doc/sql/20221013_企标计划新增字段.sql | 3 + doc/sql/20221013_企标计划更新日志.sql | 7 ++ 13 files changed, 331 insertions(+), 5 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanLogController.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanLogDao.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLog.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLogForm.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanLogService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanLogMapper.xml create mode 100644 doc/sql/20221013_企标计划新增字段.sql create mode 100644 doc/sql/20221013_企标计划更新日志.sql diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 051f9b3f..6e3cea88 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -5,16 +5,19 @@ import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.dao.QualityEvaluationDao; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang.StringUtils; -import org.apache.ibatis.annotations.Param; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; +import java.util.ArrayList; import java.util.List; /** @@ -32,6 +35,8 @@ public class EsRevisePlanController extends BaseController { @Autowired IEsRevisePlanService iEsRevisePlanService; + @Autowired + private QualityEvaluationDao qualityEvaluationDao; @ApiOperation(value = "获取所有企标计划") @GetMapping("getAllPlans") @@ -54,6 +59,41 @@ public class EsRevisePlanController extends BaseController { } } revisePlan.setArea(area); + //查评分 + if (ObjectUtils.isNotEmpty(revisePlan.getStandId())) { + List last = new ArrayList<>(); + List evaluations = qualityEvaluationDao.getEvaluationForm(new QueryWrapper().eq("law_id", revisePlan.getStandId()).eq("evaluation_type", "quality")); + for (QualityEvaluation evaluation : evaluations) { + Double score; + String value; + if (evaluation.getProcessNode()==null){ + value=""; + }else { + value=evaluation.getProcessNode(); + } + switch (value){ + case "征求意见": + score=Double.valueOf(evaluation.getScore()) * 0.3; + break; + case "技术委员会评审、评审意见修改": + score=Double.valueOf(evaluation.getScore()) * 0.4; + break; + case "重新技术委员会评审、评审意见修改": + score=Double.valueOf(evaluation.getScore()) * 0.4; + break; + case "标准化复审": + score=Double.valueOf(evaluation.getScore()) * 0.15; + break; + case "标准法规部高级经理审核": + score=Double.valueOf(evaluation.getScore()) * 0.15; + break; + + default: score=Double.valueOf(evaluation.getScore()); + } + last.add(score); + } + revisePlan.setScore(last.stream().mapToDouble(Double::doubleValue).sum()); + } } PageInfo pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans); return Result.success(pageInfo); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanLogController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanLogController.java new file mode 100644 index 00000000..b15d75ba --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanLogController.java @@ -0,0 +1,42 @@ +package com.adc.da.slrs.esRevisePlan.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLogForm; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +@RestController +@Api(description = "|EsRevisePlanLog|") +@RequestMapping("api/esRevisePlanLog/log") +public class EsRevisePlanLogController extends BaseController { + + @Autowired + private IEsRevisePlanLogService esRevisePlanLogService; + + @ApiOperation(value = "查询当前计划的日志信息") + @GetMapping("/queryLogsByPlanId") + public ResponseMessage queryLogsByPlanId(@RequestParam String planId){ + List esRevisePlanLogs = esRevisePlanLogService.queryLogsByPlanId(planId); + return Result.success(esRevisePlanLogs); + } + + @ApiOperation(value = "添加日志") + @PostMapping("/addLog") + public ResponseMessage addLog(EsRevisePlanLogForm form){ + esRevisePlanLogService.addLog(JSON.parseObject(form.getJson())); + return Result.success("操作成功"); + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanLogDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanLogDao.java new file mode 100644 index 00000000..fb163b5c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanLogDao.java @@ -0,0 +1,19 @@ +package com.adc.da.slrs.esRevisePlan.dao; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface EsRevisePlanLogDao extends BaseMapper { + + /** + * 获取当前企标计划的日志 + * @param planId + * @return + */ + List queryLogsByPlanId(@Param("planId") String planId); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java index b5be3788..2fc75fea 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java @@ -6,6 +6,7 @@ import java.util.List; import com.adc.da.base.page.BasePage; import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; +import com.adc.da.slrs.sarEnterpriseStandardEvaluation.entity.QualityEvaluation; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -51,6 +52,19 @@ public class EsRevisePlan extends BasePage { @ApiModelProperty(value = "工作组组长") private String wgLeader; + @ApiModelProperty(value = "企标ID") + private String standId; + @ApiModelProperty(value = "实际标准发布时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date actualTime; + @ApiModelProperty(value = "企标编号") + @TableField(exist = false) + private String standNumber; + @ApiModelProperty(value = "质量评分") + @TableField(exist = false) + private Double score; + @ApiModelProperty(value = "起草人姓名") @TableField(exist = false) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLog.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLog.java new file mode 100644 index 00000000..49c2db8b --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLog.java @@ -0,0 +1,42 @@ +package com.adc.da.slrs.esRevisePlan.entity; + +import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@Accessors(chain = true) +@ApiModel(value="EsRevisePlanLog对象", description="企标制修订计划日志") +public class EsRevisePlanLog extends BaseEntity { + + @ApiModelProperty(value = "id") + @TableId(value = "id",type = IdType.ID_WORKER_STR) + private String id; + @ApiModelProperty(value = "企标计划id") + private String planId; + @ApiModelProperty(value = "日志内容") + private String content; + @ApiModelProperty(value = "创建时间") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date createTime; + + public EsRevisePlanLog() { + } + + public EsRevisePlanLog(String id, String planId, String content, Date createTime) { + this.id = id; + this.planId = planId; + this.content = content; + this.createTime = createTime; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLogForm.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLogForm.java new file mode 100644 index 00000000..466a127c --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlanLogForm.java @@ -0,0 +1,12 @@ +package com.adc.da.slrs.esRevisePlan.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class EsRevisePlanLogForm { + + @ApiModelProperty(value = "json") + private String json; + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanLogService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanLogService.java new file mode 100644 index 00000000..ce08308d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanLogService.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.esRevisePlan.service; + +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +public interface IEsRevisePlanLogService extends IService { + /** + * 获取当前企标计划的日志 + * @param planId + * @return + */ + List queryLogsByPlanId(String planId); + + /** + * 添加日志 + * @param qbfsForm + */ + void addLog(JSONObject qbfsForm); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java new file mode 100644 index 00000000..b86869dd --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanLogServiceImpl.java @@ -0,0 +1,87 @@ +package com.adc.da.slrs.esRevisePlan.service.impl; + +import com.adc.da.login.util.UserUtils; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; +import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanLogService; +import com.adc.da.sys.entity.UserEO; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Service +public class EsRevisePlanLogServiceImpl extends ServiceImpl implements IEsRevisePlanLogService { + @Autowired + private EsRevisePlanLogDao esRevisePlanLogDao; + + /** + * 获取当前企标计划的日志 + * @param planId + * @return + */ + @Override + public List queryLogsByPlanId(String planId) { + return esRevisePlanLogDao.queryLogsByPlanId(planId); + } + + /** + * 添加日志 + * @param qbfsForm + */ + @Override + public void addLog(JSONObject qbfsForm) { + if (ObjectUtils.isNotEmpty(qbfsForm.get("type"))) { + String esId = (String) qbfsForm.get("esId"); + String esId1 = (String) qbfsForm.get("esId1"); + String esId2 = (String) qbfsForm.get("esId2"); + String esName = (String) qbfsForm.get("esName"); + Date date = new Date(); + String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date); + UserEO userEO= UserUtils.getUser(); + //日志内容 + String msg = userEO.getUname() + " " + now + " "; + switch ((String)qbfsForm.get("type")){ + case "1": + //合并 + String esName1 = (String) qbfsForm.get("esName1"); + String esName2 = (String) qbfsForm.get("esName2"); + msg = msg + "将《" + esName1 + "》和《"+ esName2 +"》合并为《"+ esName +"》,该计划已取消;"; + break; + case "2": + //延期 + String releaseTime = (String) qbfsForm.get("releaseTime"); + String draftTime = (String) qbfsForm.get("draftTime"); + String yqDraftTime = (String) qbfsForm.get("yqDraftTime"); + String yqReleaseTime = (String) qbfsForm.get("yqReleaseTime"); + msg = msg + "延期了《" + esName + "》 , “计划标准初稿完成时间”由“" + draftTime + "”改为“" + yqDraftTime + "”，" + + "“计划标准发布时间”由“" + releaseTime + "”改为“" + yqReleaseTime + "”;"; + break; + case "3": + //取消 + msg = msg + "取消了《" + esName + "》;"; + break; + case "4": + //更名 + String renameEs = (String) qbfsForm.get("renameEs"); + msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;"; + break; + } + if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) { + esRevisePlanLogDao.insert(new EsRevisePlanLog(null,esId,msg,date)); + } else if (ObjectUtils.isEmpty(esId)&&ObjectUtils.isNotEmpty(esId1)&&ObjectUtils.isNotEmpty(esId2)) { + esRevisePlanLogDao.insert(new EsRevisePlanLog(null,esId1,msg,date)); + esRevisePlanLogDao.insert(new EsRevisePlanLog(null,esId2,msg,date)); + } + + } + } + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index 16d8d732..de89f310 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -1,14 +1,18 @@ package com.adc.da.slrs.esRevisePlan.service.impl; +import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.esMatingRelation.entity.EsMatingRelation; import com.adc.da.slrs.esMatingRelation.service.IEsMatingRelationService; +import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanLogDao; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan; import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao; +import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanLog; import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.esStandRelation.entity.EsStandRelation; import com.adc.da.slrs.esStandRelation.service.IEsStandRelationService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.sys.entity.UserEO; import com.adc.da.util.UUIDUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -16,10 +20,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; /** @@ -43,6 +45,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlans(EsRevisePlan esRevisePlan) { @@ -137,6 +141,8 @@ public class EsRevisePlanServiceImpl extends ServiceImpl + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml index c19e6985..adb470c0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml @@ -62,6 +62,8 @@ + + @@ -201,6 +203,9 @@ es_revise_plan.drafter, es_revise_plan.res_person, es_revise_plan.wg_leader, + es_revise_plan.stand_id, + es_revise_plan.actual_time, + (SELECT STAND_CODE from sar_bussioness_stand WHERE sar_bussioness_stand.ID = es_revise_plan.stand_id) as standNumber, es_revise_plan.draft_time, es_revise_plan.release_time, es_revise_plan.unit, diff --git a/doc/sql/20221013_企标计划新增字段.sql b/doc/sql/20221013_企标计划新增字段.sql new file mode 100644 index 00000000..c6afb444 --- /dev/null +++ b/doc/sql/20221013_企标计划新增字段.sql @@ -0,0 +1,3 @@ +ALTER TABLE `es_revise_plan` +ADD COLUMN `stand_id` varchar(255) NULL AFTER `LXD`; +ADD COLUMN `actual_time` datetime NULL AFTER `stand_id`; diff --git a/doc/sql/20221013_企标计划更新日志.sql b/doc/sql/20221013_企标计划更新日志.sql new file mode 100644 index 00000000..bde3057b --- /dev/null +++ b/doc/sql/20221013_企标计划更新日志.sql @@ -0,0 +1,7 @@ +CREATE TABLE `es_revise_plan_log` ( +`id` varchar(250) NOT NULL , +`plan_id` varchar(250) NULL , +`content` longtext NULL , +`create_time` datetime NULL , +PRIMARY KEY (`id`) +); From 0ebdd2f4356608b16585a95eb0fcacc235592c21 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 14 Oct 2022 15:08:17 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3:=20=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E7=A8=8B=E7=BB=93=E6=9D=9F=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AE=A1=E5=88=92=E5=BA=93?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=EF=BC=8C=E7=AB=8B=E9=A1=B9=E5=8D=95=E5=A1=AB?= =?UTF-8?q?=E5=86=99=E7=9A=84=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E5=BD=92?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/workFlow/service/ActSarItemsPlanService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java index fd5b911e..31f7d62d 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsPlanService.java @@ -64,6 +64,7 @@ public class ActSarItemsPlanService { esRevisePlanDTO.setDraftTime(object.getDate("firstDraftTime")); esRevisePlanDTO.setReleaseTime(object.getDate("planTime")); esRevisePlanDTO.setBussSort(object.getString("bussSort")); + esRevisePlanDTO.setLxd(object.getString("LXD")); if(StringUtils.isNotBlank(object.getString("esName")) && StringUtils.isNotBlank(object.getString("bussSort"))){ EsRevisePlan qw = new EsRevisePlan(); qw.setEsName(object.getString("esName")); From b038ac6f3d0f32a9baf4391aed9dd3447bd70100 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 17 Oct 2022 16:03:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0:=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=85=8D=E7=BD=AE=E8=B5=84=E6=96=99=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/FileMaterialPage.java | 4 ++ .../service/impl/FileMaterialServiceImpl.java | 36 ++++++++++++++++++ .../zlTree/controller/ZlTreeController.java | 9 ++++- .../slrs/zlTree/service/IZlTreeService.java | 6 +++ .../service/impl/ZlTreeServiceImpl.java | 38 ++++++++++++++++++- .../fileMaterialCenter/FileMaterialMapper.xml | 6 +++ 6 files changed, 97 insertions(+), 2 deletions(-) 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 index 3cf6d7e1..35df3189 100644 --- 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 @@ -2,6 +2,8 @@ package com.adc.da.slrs.fileMaterialCenter.entity; import lombok.Data; +import java.util.List; + /** * @author zhaokaiyao */ @@ -24,4 +26,6 @@ public class FileMaterialPage { private Integer page; private Integer pageSize; + + private List treeIdList; } 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 index 39b26c26..ef9d3e82 100644 --- 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 @@ -1,13 +1,21 @@ package com.adc.da.slrs.fileMaterialCenter.service.impl; +import com.adc.da.http.Result; 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.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.tsRoleMeunData.entity.TsRoleMenuData; +import com.adc.da.slrs.tsRoleMeunData.service.ITsRoleMenuDataService; +import com.adc.da.util.LoginUserUtil; 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.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,6 +23,7 @@ import org.springframework.stereotype.Service; import javax.management.Query; import java.text.SimpleDateFormat; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -29,6 +38,12 @@ public class FileMaterialServiceImpl extends ServiceImpl(queryPage.getPage(),queryPage.getPageSize()); } + + // 获取当前登录人 + String loginUserId = LoginUserUtil.getUserId(); + + List positionIds = tsUserDao.selectPositionIds(loginUserId); + List roleIds = tsPositionService.getRoleIdsByPositionIds(positionIds); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.in("ROLE_ID", roleIds); + List tsRoleMenuData = iTsRoleMenuDataService.list(wrapper); + List treeIdList = tsRoleMenuData.stream().map(TsRoleMenuData::getMenuId).distinct().collect(Collectors.toList()); + if (CollectionUtils.isEmpty(treeIdList)) { + return null; + } + if(StringUtils.isEmpty(queryPage.getTreeId())) { + queryPage.setTreeIdList(treeIdList); + } else { + // 查看菜单是否有数据权限 + if (!treeIdList.contains(queryPage.getTreeId())) { + return null; + } + } return fileMaterialDao.getFileMaterialPage(page,queryPage); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java index f0170aa5..879bf942 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java @@ -9,6 +9,7 @@ import com.adc.da.slrs.zlTree.entity.ZlTree; import com.adc.da.slrs.zlTree.entity.ZlTreeData; import com.adc.da.slrs.zlTree.service.IZlTreeDataService; import com.adc.da.slrs.zlTree.service.IZlTreeService; +import com.adc.da.util.LoginUserUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; @@ -64,7 +65,6 @@ public class ZlTreeController extends BaseController { } - @GetMapping @ApiOperation("查询树结构") public ResponseMessage> getFileMaterial(){ @@ -72,6 +72,13 @@ public class ZlTreeController extends BaseController { return Result.success(fileMaterial); } + @GetMapping("/permissConfig") + @ApiOperation("查询树结构-角色管理") + public ResponseMessage> getFileMaterialM(){ + List fileMaterial = iZlTreeService.getLeftTreeM(); + return Result.success(fileMaterial); + } + @PutMapping @ApiOperation("修改树节点") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index 0479fa90..86898e09 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -25,6 +25,12 @@ public interface IZlTreeService extends IService { */ List getLeftTree(); + /** + * 角色管理-查询树结构 + * @return + */ + List getLeftTreeM(); + /** * 获取类型 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 275df136..4394b86b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -1,10 +1,15 @@ package com.adc.da.slrs.zlTree.service.impl; +import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.service.ITsRoleService; +import com.adc.da.slrs.sarUser.dao.TsUserDao; +import com.adc.da.slrs.sarUser.service.ITsUserService; import com.adc.da.slrs.zlTree.dao.ZlTreeDao; import com.adc.da.slrs.zlTree.entity.TreeData; import com.adc.da.slrs.zlTree.entity.ZlTree; import com.adc.da.slrs.zlTree.entity.ZlTreeData; import com.adc.da.slrs.zlTree.service.IZlTreeService; +import com.adc.da.util.LoginUserUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -31,10 +36,41 @@ public class ZlTreeServiceImpl extends ServiceImpl implements @Autowired ZlTreeDao zlTreeDao; - + @Autowired + private ITsUserService tsUserService; @Override public List getLeftTree() { + // 获取当前登录人 + String loginUserId = LoginUserUtil.getUserId(); + // 查询当前登录人的权限菜单 + List recourceIdList = tsUserService.getResourceUserId(loginUserId); + + TreeData res=new TreeData(); + QueryWrapper wrapper=new QueryWrapper<>(); + wrapper.lambda().in(ZlTree::getId, recourceIdList); + wrapper.orderByAsc("length(sort),sort"); + List list=this.list(wrapper); + List treeData=new ArrayList<>(); + //代码遍历生成树 + for (ZlTree zlTree:list) { + if (StringUtils.isNotBlank(zlTree.getParentId())){ + TreeData zlTreeData=new TreeData(); + BeanUtils.copyProperties(zlTree,zlTreeData); + treeData.add(zlTreeData); + }else { + BeanUtils.copyProperties(zlTree,res); + } + } + //递归生成树 + digui(res,treeData); + List treeData1=new ArrayList<>(); + treeData1.add(res); + return treeData1; + } + + @Override + public List getLeftTreeM() { TreeData res=new TreeData(); QueryWrapper wrapper=new QueryWrapper<>(); wrapper.orderByAsc("length(sort),sort"); 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 index a0d1a851..8c0c737d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -28,6 +28,12 @@ and zd.id=#{flieM.treeId} + + and zd.id in + + #{item} + + and fm.id=#{flieM.id} From 0a491e93f81604aab868c699f37e621c623448f0 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Mon, 17 Oct 2022 17:25:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=88=86=E6=95=B0=E6=98=AF=E7=A9=BA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EsRevisePlanController.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 6e3cea88..3900718c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -71,24 +71,25 @@ public class EsRevisePlanController extends BaseController { }else { value=evaluation.getProcessNode(); } + String evaluationScore = ObjectUtils.isEmpty(evaluation.getScore()) ? "0" : evaluation.getScore(); switch (value){ case "征求意见": - score=Double.valueOf(evaluation.getScore()) * 0.3; + score=Double.valueOf(evaluationScore) * 0.3; break; case "技术委员会评审、评审意见修改": - score=Double.valueOf(evaluation.getScore()) * 0.4; + score=Double.valueOf(evaluationScore) * 0.4; break; case "重新技术委员会评审、评审意见修改": - score=Double.valueOf(evaluation.getScore()) * 0.4; + score=Double.valueOf(evaluationScore) * 0.4; break; case "标准化复审": - score=Double.valueOf(evaluation.getScore()) * 0.15; + score=Double.valueOf(evaluationScore) * 0.15; break; case "标准法规部高级经理审核": - score=Double.valueOf(evaluation.getScore()) * 0.15; + score=Double.valueOf(evaluationScore) * 0.15; break; - default: score=Double.valueOf(evaluation.getScore()); + default: score=Double.valueOf(evaluationScore); } last.add(score); } From 7fc50fb4e0b9baf21ef5ffe612d4170d3d8ce0a6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Tue, 18 Oct 2022 09:42:06 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 index 8c0c737d..3c7f87e8 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/fileMaterialCenter/FileMaterialMapper.xml @@ -18,7 +18,8 @@