From b7c4edd36912d26aa2e8e6fa5605c370bb2e478a Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期四, 13 三月 2025 09:43:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/SuperVisePlanController.java | 5
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java | 7
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java | 12 -
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java | 4
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java | 2
cnas-device/src/main/resources/templates/sample_qr_show.html | 46 ++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java | 3
cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java | 3
cnas-device/src/main/resources/templates/device_qr_show.html | 173 ++++++++++++++++++++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java | 10
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisePlanDetailsMapper.java | 3
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrackRecordMapper.java | 5
cnas-device/src/main/resources/templates/word_qr_show.html | 93 +++++++++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java | 12
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java | 3
cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java | 5
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 14 +-
20 files changed, 366 insertions(+), 40 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 8d220be..bb8b583 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -16,6 +16,7 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.service.StandardProductListService;
+import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -54,7 +55,7 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample1 insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- String[] splits = insSample.getFactory().split(" - ");
+ String[] splits = StringUtils.isNotEmpty(insSample.getFactory())?insSample.getFactory().split(" - "):new String[0];
List<StandardProductList> list = new ArrayList<>();
if(splits.length<4){
list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0],"","");
@@ -77,13 +78,12 @@
}
}
}
- String[] split1 = insSample.getFactory().split(" - ");
//鍒ゆ柇闀垮害
- if (split1.length > 4) {
- if (ObjectUtils.isNotEmpty(split1[3])) {
- list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),split1[3])).collect(Collectors.toList());
- }else if (split1[3].isEmpty()) {
- list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),split1[2])).collect(Collectors.toList());
+ if (splits.length > 4) {
+ if (ObjectUtils.isNotEmpty(splits[3])) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSample())&&Objects.equals(list1.getSample(),splits[3])).collect(Collectors.toList());
+ }else if (splits[3].isEmpty()) {
+ list = list.stream().filter(list1 -> Objects.nonNull(list1.getSampleType())&&Objects.equals(list1.getSampleType(),splits[2])).collect(Collectors.toList());
}
}
list = list.stream().filter(a -> {
diff --git a/cnas-device/src/main/resources/templates/device_qr_show.html b/cnas-device/src/main/resources/templates/device_qr_show.html
new file mode 100644
index 0000000..ba5567b
--- /dev/null
+++ b/cnas-device/src/main/resources/templates/device_qr_show.html
@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>璁惧杩愯鎬昏</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+ <style>
+ *{
+ margin: 0;
+ padding: 0;
+ }
+ body {
+ -webkit-text-size-adjust: 100%!important;
+ text-size-adjust: 100%!important;
+ -moz-text-size-adjust: 100%!important;
+ }
+ .main{
+ width: 100%;
+ background-color: #f5f7fa;
+ padding:10px 0;
+ }
+ .chartContainer{
+ width:92%;
+ margin-left:4%;
+ height:200px;
+ background-color: #fff;
+ border-radius: 5px;
+ }
+ .info{
+ width:92%;
+ margin-left:4%;
+ height:calc(100% - 230px);
+ background-color: #fff;
+ margin-top: 10px;
+ padding-bottom: 10px;
+ border-radius: 5px;
+ }
+ .info div{
+ display: flex;
+ width: 92%;
+ margin-left: 4%;
+ border-bottom: 1px solid #dddddd;
+ height: 40px;
+ }
+ .info div span{
+ width:100px;
+ color: #797979;
+ font-size: clamp(0.563rem, -2.813rem + 15vw, 0.75rem) !important;
+ line-height: 40px;
+ }
+ .info div p{
+ width:calc(100% - 100px);
+ height:40px;
+ font-size: clamp(0.563rem, -2.813rem + 15vw, 0.75rem) !important;
+ font-weight: bold;
+ line-height: 40px;
+ text-align: right;
+ }
+ .success{
+ color:#21a700
+ }
+ .failed{
+ color:#d80000
+ }
+ .other{
+ color: #e8a849;
+ }
+ .stop{
+ color: lightgray;
+ }
+ .download-link{
+ text-decoration:none;
+ width:80px;
+ height:25px;
+ margin:7.5px 10px;
+ background-color: #0066ff;
+ color:#fff;
+ font-size:clamp(0.563rem, -2.813rem + 15vw, 0.75rem) !important;
+ border:none;
+ border-radius: 3px;
+ line-height: 25px;
+ text-align: center;
+ }
+ .insProduct{
+ overflow-x: scroll;
+ overflow-y: hidden;
+ display: inline-block
+ }
+ .info div:last-child{
+ white-space: nowrap;
+ }
+ </style>
+</head>
+<body>
+ <input type="hidden" id="progress" th:value="${progress}">
+ <div class="main">
+ <div class="chartContainer" id="chartContainer" ></div>
+ <div class="info">
+ <div>
+ <span>璁惧鍚嶇О</span>
+ <p th:text="${deviceName}"></p>
+ </div>
+ <div>
+ <span>璁惧缂栧彿</span>
+ <p th:text="${deviceCode}"></p>
+ </div>
+ <div>
+ <span>鍚敤鏃堕暱(骞�)</span>
+ <p th:text="${usedYears}"></p>
+ </div>
+ <div>
+ <span>璁惧杩愯鐘舵��</span>
+ <p th:if="${runStatus==0}" class="success">姝ｅ父</p>
+ <p th:if="${runStatus==1}" class="other">缁翠慨</p>
+ <p th:if="${runStatus==2}" class="stop">鍋滅敤</p>
+ <p th:if="${runStatus==3}" class="failed">鎶ュ簾</p>
+ </div>
+ <div>
+ <span>
+ 鏈�杩戞牎鍑嗘棩鏈�
+ </span>
+ <input type="hidden" id="downloadUrl" th:value="${downloadUrl}">
+ <a th:href="${downloadUrl}" onclick="return hasDownload()" th:download="${fileName}" rel="noopener noreferrer" class="download-link">璇佷功涓嬭浇</a>
+ <p th:text="${lastCalibrationDate}"></p>
+ </div>
+ <div>
+ <span>涓嬫鏍″噯鏃ユ湡</span>
+ <p th:text="${nextCalibrationDate}"></p>
+ </div>
+ <div>
+ <span>鏍″噯鎬荤粨璁�</span>
+ <p th:if="${calibrateStatus=='鍚堟牸'}" class="success" th:text="${calibrateStatus}"></p>
+ <p th:if="${calibrateStatus=='涓嶅悎鏍�'}" class="failed" th:text="${calibrateStatus}"></p>
+ <p th:if="${calibrateStatus=='鍏朵粬'}" class="other" th:text="${calibrateStatus}"></p>
+ </div>
+ <div>
+ <span>鏈�杩戞牳鏌ユ棩鏈�</span>
+ <p th:text="${lastExamineDate}"></p>
+ </div>
+ <div>
+ <span>涓嬫鏍告煡鏃ユ湡</span>
+ <p th:text="${nextExamineDate}"></p>
+ </div>
+ <div>
+ <span>鏍告煡鎬荤粨璁�</span>
+ <p th:if="${examineStatus=='鍚堟牸'}" class="success" th:text="${examineStatus}"></p>
+ <p th:if="${examineStatus=='涓嶅悎鏍�'}" class="failed" th:text="${examineStatus}"></p>
+ <p th:if="${examineStatus=='鍏朵粬'}" class="other" th:text="${examineStatus}"></p>
+ </div>
+ <div>
+ <span>鏈�杩戠淮鎶ゆ棩鏈�</span>
+ <p th:text="${maintenanceDate}"></p>
+ </div>
+ <div>
+ <span>涓嬫缁存姢鏃ユ湡</span>
+ <p th:text="${nextMaintenanceDate}"></p>
+ </div>
+ <div>
+ <span>缁存姢绫诲瀷</span>
+ <p th:text="${maintenanceType}"></p>
+ </div>
+ <div>
+ <span>娴嬮噺椤圭洰</span>
+ <p th:text="${insProduct}" class="insProduct"></p>
+ </div>
+ </div>
+ </div>
+
+</body>
+<script th:src="@{/static/js/echarts.js}"></script>
+<script th:src="@{/static/js/device_qr_show.js}"></script>
+</html>
\ No newline at end of file
diff --git a/cnas-device/src/main/resources/templates/sample_qr_show.html b/cnas-device/src/main/resources/templates/sample_qr_show.html
new file mode 100644
index 0000000..b470f18
--- /dev/null
+++ b/cnas-device/src/main/resources/templates/sample_qr_show.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+ <title>鏍峰搧淇℃伅</title>
+ <style>
+
+ </style>
+</head>
+<body>
+<p>
+ <span style="font-weight: bold">鏍峰搧缂栧彿锛�</span>
+ <span th:text="${sampleCode}"></span>
+</p>
+<p>
+ <span style="font-weight: bold">濮旀墭鍗曞彿锛�</span>
+ <span th:text="${entrustCode}"></span>
+</p>
+<p>
+ <span style="font-weight: bold">瑙勬牸鍨嬪彿锛�</span>
+ <span th:text="${model}"></span>
+</p>
+<p>
+ <span style="font-weight: bold">鏍峰搧鍚嶇О锛�</span>
+ <span th:text="${sample}"></span>
+</p>
+<p>
+ <span style="font-weight: bold">妫�娴嬮」鐩細</span>
+ <span th:text="${inspectionItem}"></span>
+</p>
+<p>
+ <span style="font-weight: bold">鏍峰搧鐘舵�侊細</span>
+ <input type="checkbox" disabled name="insState" value="0" th:checked="${insState == 0}">
+ <label>寰呮</label>
+ <input type="checkbox" disabled name="insState" value="1" th:checked="${insState == 1}">
+ <label>鍦ㄦ</label>
+ <input type="checkbox" disabled name="insState" value="2" th:checked="${insState == 2}">
+ <label>宸叉</label>
+ <input type="checkbox" disabled name="isLeave" value="1" th:checked="${isLeave == 1}">
+ <label>鐣欐牱</label>
+
+</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/cnas-device/src/main/resources/templates/word_qr_show.html b/cnas-device/src/main/resources/templates/word_qr_show.html
new file mode 100644
index 0000000..ebaa864
--- /dev/null
+++ b/cnas-device/src/main/resources/templates/word_qr_show.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+ <meta charset="UTF-8">
+ <title>妫�娴嬫姤鍛�</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <style>
+ .descriptions {
+ width: 65%;
+ text-align: left;
+ }
+ .descriptions-title {
+ width: 35%;
+ text-align: center;
+ }
+ .table {
+ font-size: 1em;
+ color: #1c2023;
+ border-collapse: collapse;
+ width: 100%;
+ }
+ .table tr {
+ height: 3em;
+ }
+ table tr:nth-child(odd) .descriptions-title{
+ background-color: #dddddd;
+ }
+ table tr:nth-child(odd) .descriptions{
+ background-color: #f0f0f0;
+ }
+ </style>
+</head>
+<body>
+<h4 th:text="'鎶ュ憡缂栧彿锛�' + ${entrustCode}"></h4>
+<table class="table">
+ <tr>
+ <td class="descriptions-title">璇� 鏍� 鍚� 绉�<br/>Name of Product</td>
+ <td class="descriptions">
+ <p>
+ <span th:text="${productName}"></span>
+ <br/>
+ <span th:text="${productNameEn}"></span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="descriptions-title">鍨� 鍙�<br/>Type and Size</td>
+ <td class="descriptions" th:text="${insOrderModel}"></td>
+ </tr>
+ <tr>
+ <td class="descriptions-title">濮� 鎵� 鍗� 浣�<br/>Client</td>
+ <td class="descriptions">
+ <p>
+ <span th:text="${company}"></span>
+ <br/>
+ <span th:text="${companyEn}"></span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="descriptions-title">妫� 楠� 绫� 鍒�<br/>Kind of Test</td>
+ <td class="descriptions">
+ <p>
+ <span th:text="${orderType}"></span>
+ <br/>
+ <span th:text="${orderTypeEn}"></span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="descriptions-title">鏀� 鏍� 鏃� 鏈�<br/>Received date</td>
+ <td class="descriptions">
+ <p>
+ <span th:text="${getTime}"></span>
+ <br/>
+ <span th:text="${getTimeEn}"></span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td class="descriptions-title">绛� 鍙� 鏃� 鏈�<br/>Date of issue</td>
+ <td class="descriptions">
+ <p>
+ <span th:text="${issuingDate}"></span>
+ <br/>
+ <span th:text="${issuingDateEn}"></span>
+ </p>
+ </td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
index e9838af..1a824e1 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonJobResponsibilitiesController.java
@@ -44,7 +44,7 @@
@ApiOperation(value = "鏌ヨ 宀椾綅鑱岃矗")
@GetMapping("personJobResponsibilitiesSelect")
- public Result<IPage<PersonJobResponsibilitiesDto>> personJobResponsibilitiesSelect(Page page, String userId, String departmentId, String userName) {
+ public Result<IPage<PersonJobResponsibilitiesDto>> personJobResponsibilitiesSelect(Page page, Integer userId, String departmentId, String userName) {
IPage<PersonJobResponsibilitiesDto> iPage = personJobResponsibilitiesService.personJobResponsibilitiesSelect(page, userId, departmentId, userName);
return Result.success(iPage);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
index f485096..77c1e1e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonTrainingController.java
@@ -25,10 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
+import java.util.*;
/**
* <p>
@@ -145,7 +142,7 @@
Integer departId,
Integer state) {
Integer planId = 0;
- if(id.equals("null") || StringUtils.isEmpty(id)) {
+ if(ObjectUtils.isNull(id) || StringUtils.isEmpty(id)) {
planId = null;
} else {
planId = Integer.parseInt(id);
@@ -185,8 +182,9 @@
@ApiOperation(value = "鍩硅涓庤�冩牳璁板綍 璁ら")
@PostMapping("claimOfTrainingAndAssessmentRecords")
- public Result<?> claimOfTrainingAndAssessmentRecords(@RequestParam("claimAndClaim") Boolean claimAndClaim,
- @RequestParam("courseId") Integer courseId) {
+ public Result<?> claimOfTrainingAndAssessmentRecords(@RequestBody Map<String,Object> map) {
+ Boolean claimAndClaim = (Boolean)map.get("claimAndClaim");
+ Integer courseId = (Integer)map.get("courseId");
personTrainingRecordService.claimOfTrainingAndAssessmentRecords(claimAndClaim, courseId);
return Result.success();
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/SuperVisePlanController.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/SuperVisePlanController.java
index 1c63015..25f87bc 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/SuperVisePlanController.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/controller/SuperVisePlanController.java
@@ -1,9 +1,11 @@
package com.ruoyi.personnel.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.personnel.dto.PersonSupervisePlanDetailsDto;
import com.ruoyi.personnel.dto.PersonSupervisePlanDto;
import com.ruoyi.personnel.pojo.PersonSupervisePlan;
@@ -58,6 +60,9 @@
PersonSupervisePlan byId = personSupervisePlanService.getById(id);
// 閫氫俊鐨勪负璁稿啗 鐢靛姏鐨勬槸鍒樺缓寰�
Integer approvalId = null;
+ if (ObjectUtils.isNull(byId.getDepartId())){
+ throw new ErrorException("璇ョ敤鎴锋病鏈夐厤缃浉鍏冲疄楠屽閮ㄩ棬淇℃伅!!");
+ }
Integer departId = byId.getDepartId();
if(departId.equals(18)) {
approvalId = 11;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java
index a46e3bf..487a81e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonJobResponsibilitiesMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.personnel.dto.PersonJobResponsibilitiesDto;
import com.ruoyi.personnel.pojo.PersonJobResponsibilities;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,5 +17,5 @@
*/
public interface PersonJobResponsibilitiesMapper extends BaseMapper<PersonJobResponsibilities> {
- IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page, String userId, String departmentId, String userName);
+ IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page, @Param("userId") Integer userId, @Param("departmentId") String departmentId, @Param("userName") String userName);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java
index b2bb671..9ced914 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPersonnelCapacityMapper.java
@@ -18,7 +18,7 @@
*/
public interface PersonPersonnelCapacityMapper extends BaseMapper<PersonPersonnelCapacity> {
- IPage<PersonPersonnelCapacityDto> personPersonnelCapacityPage(Page page, Integer departLimsId, Integer userId, String userName);
+ IPage<PersonPersonnelCapacityDto> personPersonnelCapacityPage(Page page, @Param("departLimsId") Integer departLimsId, @Param("userId") Integer userId, @Param("userName") String userName);
/**
* 鏌ヨ浜哄憳鑳藉姏鎺ュ彛
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java
index 1121811..25e4906 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonPostAuthorizationRecordMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.personnel.dto.PersonPostAuthorizationRecordDto;
import com.ruoyi.personnel.pojo.PersonPostAuthorizationRecord;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,5 +17,5 @@
*/
public interface PersonPostAuthorizationRecordMapper extends BaseMapper<PersonPostAuthorizationRecord> {
- IPage<PersonPostAuthorizationRecordDto> personPostAuthorizationRecordPage(Page page, Integer departLimsId, Integer userId, String userName);
+ IPage<PersonPostAuthorizationRecordDto> personPostAuthorizationRecordPage(Page page, @Param("departLimsId") Integer departLimsId, @Param("userId") Integer userId, @Param("userName") String userName);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
index a77cb79..ec67c20 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonRewardPunishmentRecordMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.personnel.dto.PersonRewardPunishmentRecordDto;
import com.ruoyi.personnel.excel.PersonRewardPunishmentRecordExcel;
import com.ruoyi.personnel.pojo.PersonRewardPunishmentRecord;
+import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
@@ -20,7 +21,7 @@
*/
public interface PersonRewardPunishmentRecordMapper extends BaseMapper<PersonRewardPunishmentRecord> {
- IPage<PersonRewardPunishmentRecordDto> rewardPunishmentPage(Page page, Integer userId, String userName, Date startTime, Date endTime, Integer departmentId);
+ IPage<PersonRewardPunishmentRecordDto> rewardPunishmentPage(Page page, @Param("userId") Integer userId, @Param("userName") String userName, @Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("departmentId") Integer departmentId);
- List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(Integer userId, Integer departmentId, String userName, Date startTime, Date endTime);
+ List<PersonRewardPunishmentRecordExcel> rewardPunishmentExport(@Param("userId") Integer userId, @Param("departmentId") Integer departmentId, @Param("userName") String userName, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisePlanDetailsMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisePlanDetailsMapper.java
index 67fd119..8750f11 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisePlanDetailsMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisePlanDetailsMapper.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.personnel.dto.PersonSupervisePlanDetailsDto;
import com.ruoyi.personnel.pojo.PersonSupervisePlanDetails;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,6 +17,6 @@
*/
public interface PersonSupervisePlanDetailsMapper extends MyBaseMapper<PersonSupervisePlanDetails> {
- IPage<PersonSupervisePlanDetailsDto> pageByDate(Page page, String date, String project, Integer planId);
+ IPage<PersonSupervisePlanDetailsDto> pageByDate(@Param("page") Page page, @Param("date") String date, @Param("project") String project, @Param("planId") Integer planId);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java
index d49cbd0..f143527 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonSupervisionRecordMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.personnel.dto.PersonSupervisionRecordDto;
import com.ruoyi.personnel.pojo.PersonSupervisionRecord;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -16,7 +17,7 @@
*/
public interface PersonSupervisionRecordMapper extends BaseMapper<PersonSupervisionRecord> {
- IPage<PersonSupervisionRecordDto> personSupervisionRecordPage(Page page, Integer userId, Integer departLimsId, String userName);
+ IPage<PersonSupervisionRecordDto> personSupervisionRecordPage(Page page, @Param("userId") Integer userId, @Param("departLimsId") Integer departLimsId, @Param("userName") String userName);
/**
* 鏌ヨ鐩戠潱璁板綍璇︽儏
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrackRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrackRecordMapper.java
index d631e0c..c633423 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrackRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrackRecordMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.personnel.pojo.PersonTrackRecord;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,8 +18,8 @@
*/
public interface PersonTrackRecordMapper extends BaseMapper<PersonTrackRecord> {
- IPage<PersonTrackRecord> personTrackRecordSelect(Page page, String userId, String departLimsId);
+ IPage<PersonTrackRecord> personTrackRecordSelect(Page page, @Param("userId") String userId, @Param("departLimsId") String departLimsId);
- List<PersonTrackRecord> personTrackRecordExport(String userId, String departLimsId);
+ List<PersonTrackRecord> personTrackRecordExport(@Param("userId") String userId, @Param("departLimsId") String departLimsId);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
index 1319c16..0298700 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingDetailedMapper.java
@@ -20,12 +20,12 @@
public interface PersonTrainingDetailedMapper extends MyBaseMapper<PersonTrainingDetailed> {
IPage<PersonTrainingDetailedDto> queryTheAnnualPlanDetailsTable(Page page,
- String trainingLecturerName,
- String courseCode, String trainingDate,
- Integer id,
- Integer userId,
- Integer loginUserId,
- Integer state);
+ @Param("trainingLecturerName") String trainingLecturerName,
+ @Param("courseCode") String courseCode, @Param("trainingDate") String trainingDate,
+ @Param("id") Integer id,
+ @Param("userId") Integer userId,
+ @Param("loginUserId") Integer loginUserId,
+ @Param("state") Integer state);
/**
* 鏍规嵁涓昏〃id鏌ヨ璇︽儏
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
index a10ed81..a0fe210 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/mapper/PersonTrainingRecordMapper.java
@@ -21,9 +21,9 @@
*/
public interface PersonTrainingRecordMapper extends BaseMapper<PersonTrainingRecord> {
- List<PersonTrainingRecordDto> trainingAndAssessmentRecordsPage(Integer trainingDetailedId, String userName);
+ List<PersonTrainingRecordDto> trainingAndAssessmentRecordsPage(@Param("trainingDetailedId") Integer trainingDetailedId, @Param("userName") String userName);
- IPage<PersonTrainingRecordListDto> personnelTrainingPersonnel(Page page, String userName, Integer userId, Integer departLimsId);
+ IPage<PersonTrainingRecordListDto> personnelTrainingPersonnel(Page page, @Param("userName") String userName, @Param("userId") Integer userId, @Param("departLimsId") Integer departLimsId);
IPage<TrainingRecordPersonDetailedDto> queryPersonnelDetails(Page page, Integer userId);
@@ -55,13 +55,13 @@
* @param year
* @return
*/
- IPage<TrainingRecordPersonDetailedDto> queryPersonnelDetailsOfUserIdAndYear(Page page, Integer userId, Integer year);
+ IPage<TrainingRecordPersonDetailedDto> queryPersonnelDetailsOfUserIdAndYear(Page page, @Param("userId") Integer userId, @Param("year") Integer year);
/**
* 鏍规嵁鐢ㄦ埛id鍜屽勾浠芥煡璇汉鍛樻槑缁� 鍩硅璁板綍瀵煎嚭
* @param userId
- * @param trainingDate
+ * @param
* @return
*/
- List<TrainingRecordPersonDetailedDto> selectPersonDetailedDtosByTrainingDate(Integer userId, Integer year);
+ List<TrainingRecordPersonDetailedDto> selectPersonDetailedDtosByTrainingDate(@Param("userId") Integer userId, @Param("year") Integer year);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
index 2afa074..7ec0914 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonJobResponsibilitiesService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.personnel.dto.PersonJobResponsibilitiesDto;
import com.ruoyi.personnel.pojo.PersonJobResponsibilities;
+import org.apache.ibatis.annotations.Param;
import javax.servlet.http.HttpServletResponse;
@@ -19,9 +20,9 @@
public interface PersonJobResponsibilitiesService extends IService<PersonJobResponsibilities> {
IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page,
- String userId,
- String departmentId,
- String userName);
+ @Param("userId") Integer userId,
+ @Param("departmentId") String departmentId,
+ @Param("userName") String userName);
void exportPersonJobResponsibilities(Integer id, HttpServletResponse response);
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
index 4fd2df2..933f74d 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonJobResponsibilitiesServiceImpl.java
@@ -42,7 +42,7 @@
@Override
- public IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page, String userId, String departmentId, String userName) {
+ public IPage<PersonJobResponsibilitiesDto> personJobResponsibilitiesSelect(Page page, Integer userId, String departmentId, String userName) {
return baseMapper.personJobResponsibilitiesSelect(page, userId, departmentId, userName);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 61a8a7b..44a6ab4 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -85,7 +85,7 @@
@GetMapping("/selectOrderManDay")
public Result<?> selectOrderManDay(Integer id) {
int day = insProductService.selectOrderManDay(id);
- return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ return Result.success(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),"鎴愬姛");
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java
index 2703c59..7b6861d 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/Result.java
@@ -54,6 +54,10 @@
return restResult(data, FAIL, "鎿嶄綔澶辫触");
}
+ public static <T> Result<T> fail(Integer code){
+ return restResult(null, code,"fail");
+ }
+
public static <T> Result<T> fail(T data, String msg)
{
return restResult(data, FAIL, msg);
--
Gitblit v1.9.3