From 9a16d4675b22d0845158d0f07424f4bda2e39475 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 九月 2023 18:02:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 4a54ccd..9415e88 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -9,6 +9,7 @@
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.MyUtil;
import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -27,7 +28,6 @@
* @author zss
* @since 2023-08-07 10:04:01
*/
-@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -41,16 +41,17 @@
@Autowired
private OpinionService opinionService;
- @ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
+ @ApiOperation(value = "涓嶅悎鏍煎搧绠＄悊鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "formTime",value = "鏉ユ枡鏃ユ湡",dataTypeClass = String.class),
- @ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = Integer.class),
})
@GetMapping("/selectUnRawInspectsList")
- public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
- IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
+ public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState, Integer productCategories){
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState, productCategories);
Map<String, Object> map = new HashMap<>();
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
@@ -85,6 +86,20 @@
return Result.success(map);
}
+ @ApiOperation(value = "璇勫", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rawId",value = "鍘熸潗鏂橧d",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "passOrNo",value = "鏄惁閫氳繃锛�0锛氫笉閫氳繃锛�1锛氶�氳繃",dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/evaluatePassOrNo")
+ public Result<?> rawEvaluate(Integer rawId, Integer passOrNo){
+ Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
+ if (integer >= 1) {
+ return Result.success("璇勫鎴愬姛锛�");
+ }
+ return Result.fail("璇勫澶辫触锛�");
+ }
+
@ApiOperation(value = "涓嶅悎鏍煎搧鍒嗛〉鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
@@ -115,12 +130,11 @@
@ApiOperation(value = "缂栬緫鎰忚-->纭畾鎸夐挳", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@PostMapping("/addOpinion")
- public Result<?> updateOpinion(@RequestHeader("token") String token, @Validated @RequestBody List<Opinion> opinion) throws Exception {
- MyUtil.PrintLog(opinion.toString());
-
+ public Result<?> updateOpinion(@RequestHeader("token") String token, @RequestBody Map<String, Object> opinion) throws Exception {
+ List<?> opinion1 = JackSonUtil.unmarshal(JackSonUtil.marshal(opinion.get("opinion")), List.class);
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
String id = data.get("id").replaceAll("\"", "");
- opinionService.updateOpinion(id, opinion);
+ opinionService.updateOpinion(id, opinion1);
return Result.success("娣诲姞鎴愬姛锛�");
}
--
Gitblit v1.9.3