From bdd6710fdc9804e56ea87cdb2edfb9a17052bf88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 8 Jun 2023 19:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDictServiceImpl.java | 6 +++- .../ota/controller/OtaBaCxListController.java | 26 +++++++++++++++-- .../ota/controller/OtaBaSjListController.java | 29 +++++++++++++++++-- .../jero/modules/ota/entity/OtaBaCxList.java | 20 +++++++++++++ .../jero/modules/ota/entity/OtaBaSjList.java | 15 ++++++++++ .../ota/service/IOtaBaCxListService.java | 2 +- .../ota/service/IOtaBaSjListService.java | 2 +- .../service/impl/OtaBaCxListServiceImpl.java | 23 +++++++++++++-- .../service/impl/OtaBaSjListServiceImpl.java | 28 ++++++++++++++++-- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- 11 files changed, 141 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 24788b2a5..040333ca3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -127,7 +127,11 @@ public class SysDictServiceImpl extends ServiceImpl impl @Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#code+':'+#key+#cut") public String queryDictTextByKeyEn(String code, String key,String cut) { log.debug("无缓存dictText的时候调用这里！"); - return sysDictMapper.queryDictTextByKeyEn(code, key); + if (CutEnum.CN.getValue().equals(cut)) { + return sysDictMapper.queryDictTextByKey(code, key); + }else{ + return sysDictMapper.queryDictTextByKeyEn(code, key); + } } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java index aabf9ba83..004f10ccd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/controller/OtaBaCxListController.java @@ -12,6 +12,8 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.modules.extRepo.entity.ExtRepoData; import com.jero.modules.ota.entity.OtaBaCxList; import com.jero.modules.ota.service.IOtaBaCxListService; +import com.jero.modules.ota.utils.ComparisonUtil; +import com.jero.modules.system.service.ISysDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -26,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,6 +46,8 @@ import java.util.Map; public class OtaBaCxListController extends JeroController { @Autowired private IOtaBaCxListService otaBaCxListService; + @Autowired + private ISysDictService sysDictService; /** * 分页列表查询 @@ -94,7 +99,23 @@ public class OtaBaCxListController extends JeroController pageList = otaBaCxListService.page(page, queryWrapper); - return Result.OK(pageList); + for (OtaBaCxList pa : pageList.getRecords()) { + pa.setBazt_dictText(sysDictService.queryDictTextByKeyEn("recordstatus", pa.getBazt(), req.getParameter("cut"))); + } + Map resMap = new HashMap<>(); + resMap.put("list", pageList); + //有审批周期的数据 + int days = 0; + int spzqSum = 0; + List list = otaBaCxListService.list(queryWrapper); + for (OtaBaCxList cx : list) { + if (StringUtils.isNotEmpty(cx.getSpzq())) { + days++; + spzqSum += Integer.parseInt(cx.getSpzq()); + } + } + resMap.put("pjspzq", days == 0 ? 0 : Math.floor(spzqSum / days)); + return Result.OK(resMap); } /** @@ -219,9 +240,10 @@ public class OtaBaCxListController extends JeroController { @Autowired private IOtaBaSjListService otaBaSjListService; + @Autowired + private ISysDictService sysDictService; /** * 分页列表查询 @@ -90,8 +96,24 @@ public class OtaBaSjListController extends JeroController pageList = otaBaSjListService.page(page, queryWrapper); - this.otaBaSjListService.disposeData(pageList.getRecords(),otaBaSjList); - return Result.OK(pageList); + for (OtaBaSjList pa : pageList.getRecords()) { + pa.setBazt_dictText(sysDictService.queryDictTextByKeyEn("recordstatus", pa.getBazt(), req.getParameter("cut"))); + } + this.otaBaSjListService.disposeData(pageList.getRecords(), otaBaSjList); + Map resMap = new HashMap<>(); + resMap.put("list", pageList); + //有审批周期的数据 + int days = 0; + int spzqSum = 0; + List list = otaBaSjListService.list(queryWrapper); + for (OtaBaSjList sj : list) { + if (StringUtils.isNotEmpty(sj.getSpzq())) { + days++; + spzqSum += Integer.parseInt(sj.getSpzq()); + } + } + resMap.put("pjspzq", days == 0 ? 0 : Math.floor(spzqSum / days)); + return Result.OK(resMap); } /** @@ -215,9 +237,10 @@ public class OtaBaSjListController extends JeroController { /** * 备案维护 */ - void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); + void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut); void exportTemplate(HttpServletResponse response, HttpServletRequest request); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java index ebbd83ddd..0d586026b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/IOtaBaSjListService.java @@ -66,7 +66,7 @@ public interface IOtaBaSjListService extends IService { /** * 备案维护 */ - void batchRecord(String ids, String bazt, String batjsj, String bz, String cut); + void batchRecord(String ids, String bazt, String batjsj, String tgthsj,String bz, String cut); void exportTemplate(HttpServletResponse response, HttpServletRequest request) throws Exception; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java index 29b06bca5..0b3e47927 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaCxListServiceImpl.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.text.SimpleDateFormat; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -152,15 +153,33 @@ public class OtaBaCxListServiceImpl extends ServiceImpl> E page(E page) { + return super.page(page); + } /** * 保存 @@ -150,15 +156,33 @@ public class OtaBaSjListServiceImpl extends ServiceImpl