From 2d6a0cdcb1e31510a6f7776abab17cc5cb82fdcb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 13 九月 2023 17:50:04 +0800
Subject: [PATCH] 修改2.0   9.13

---
 standard-server/src/main/java/com/yuanchu/mom/mapper/TechniqueMapper.java                   |    6 +
 standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java          |   14 +++
 base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java       |   11 ++
 base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java      |   26 +++---
 base-server/src/main/resources/mapper/DeviceMapper.xml                                      |    4 
 inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java    |   67 ++++++++--------
 standard-server/src/main/resources/mapper/TechniqueMapper.xml                               |   16 ++++
 base-server/src/main/java/com/yuanchu/mom/mapper/TechniqueModelMapper.java                  |    6 +
 base-server/src/main/resources/mapper/TechniqueModelMapper.xml                              |   12 +++
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java           |    3 
 inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java          |    1 
 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java |   22 +++++
 12 files changed, 137 insertions(+), 51 deletions(-)

diff --git a/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java b/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
index 4dc370b..216ddc5 100644
--- a/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
+++ b/base-server/src/main/java/com/yuanchu/mom/controller/TechnologyTemplateController.java
@@ -45,7 +45,7 @@
 
     @ApiOperation(value = "鏂板宸ヨ壓璺嚎缁存姢-->閫夋嫨宸ュ簭")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/chooseTech")
     public Result chooseTech(Integer type) {
@@ -67,17 +67,17 @@
 
     @ApiOperation(value = "鏌ヨ宸ヨ壓璺嚎鍒楄〃-->宸﹁竟浜岀骇灞曠ず")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = Integer.class,required = true),
+            @ApiImplicitParam(name = "type", value = "绫诲瀷(涓虹┖=0姗¤兌杩炴帴鍣�)", dataTypeClass = Integer.class, required = true),
             @ApiImplicitParam(name = "message", value = "鎼滅储鍐呭", dataTypeClass = String.class)
     })
     @GetMapping("/selectAllTechTem")
-    public Result selectAllTechTem(Integer type,String message) {
-        return Result.success(technologyTemplateService.selectAllTechTem(type,message));
+    public Result selectAllTechTem(Integer type, String message) {
+        return Result.success(technologyTemplateService.selectAllTechTem(type, message));
     }
 
     @ApiOperation(value = "鏌ヨ宸ヨ壓璺嚎鍒楄〃-->鍙宠竟灞曠ず宸ヨ壓鍜岃澶�")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "father", value = "宸ュ簭(鐖剁被)", dataTypeClass = String.class,required = true)
+            @ApiImplicitParam(name = "father", value = "宸ュ簭(鐖剁被)", dataTypeClass = String.class, required = true)
     })
     @GetMapping("/selectAllTechNam")
     public Result selectAllTechNam(String father) {
@@ -86,7 +86,7 @@
 
     @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/selecTechById")
     public Result selecTechById(Integer id) {
@@ -95,27 +95,27 @@
 
     @ApiOperation(value = "缂栬緫")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
     })
     @PostMapping("/writeTechById")
-    public Result writeTechById(Integer id,@Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
-        technologyTemplateService.writeTechById(id,technologyTemplateDto);
-        return Result.success("淇敼"+id+"鎴愬姛!");
+    public Result writeTechById(Integer id, @Validated @RequestBody TechnologyTemplateDto technologyTemplateDto) {
+        technologyTemplateService.writeTechById(id, technologyTemplateDto);
+        return Result.success("淇敼" + id + "鎴愬姛!");
     }
 
     @ApiOperation(value = "鍒犻櫎")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class,required = true)
+            @ApiImplicitParam(name = "id", value = "宸ヨ壓璺嚎id", dataTypeClass = Integer.class, required = true)
     })
     @PostMapping("/delTechById")
     public Result delTechById(Integer id) {
         technologyTemplateService.delTechById(id);
-        return Result.success("鍒犻櫎"+id+"鎴愬姛!");
+        return Result.success("鍒犻櫎" + id + "鎴愬姛!");
     }
 
     @ApiOperation(value = "鎵归噺鍒犻櫎")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "ids", value = "宸ヨ壓璺嚎id", dataTypeClass = String.class,required = true)
+            @ApiImplicitParam(name = "ids", value = "宸ヨ壓璺嚎id", dataTypeClass = String.class, required = true)
     })
     @PostMapping("/delAllTech")
     public Result delAllTech(String ids) {
diff --git a/base-server/src/main/java/com/yuanchu/mom/mapper/TechniqueModelMapper.java b/base-server/src/main/java/com/yuanchu/mom/mapper/TechniqueModelMapper.java
index a64a84f..53acf85 100644
--- a/base-server/src/main/java/com/yuanchu/mom/mapper/TechniqueModelMapper.java
+++ b/base-server/src/main/java/com/yuanchu/mom/mapper/TechniqueModelMapper.java
@@ -34,5 +34,11 @@
 
     //鏍规嵁宸ヨ壓璺嚎id鎵归噺鍒犻櫎
     void delAllByTechId(String ids);
+
+    //鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎
+    void delTechById(Integer id);
+
+    //鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎
+    void delAllTech(String ids);
 }
 
diff --git a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java
index dd5df9a..dc893c3 100644
--- a/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java
+++ b/base-server/src/main/java/com/yuanchu/mom/service/impl/TechnicalModelServiceImpl.java
@@ -2,11 +2,13 @@
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.mapper.TechnicalModelMapper;
+import com.yuanchu.mom.mapper.TechniqueModelMapper;
 import com.yuanchu.mom.pojo.TechnicalModel;
 import com.yuanchu.mom.pojo.dto.TechnicalModelDto;
 import com.yuanchu.mom.service.TechnicalModelService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -23,6 +25,9 @@
 
     @Resource
     TechnicalModelMapper technicalModelMapper;
+
+    @Resource
+    TechniqueModelMapper techniqueModelMapper;
 
     //鏌ヨ鎶�鏈寚鏍囩淮鎶ゅ垪琛�-->宸﹁竟浜岀骇灞曠ず宸ュ簭鍜屽伐鑹�
     @Override
@@ -78,17 +83,23 @@
 
     //鍒犻櫎
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delTechById(Integer id) {
+        //鍒犻櫎鎶�鏈寚鏍�
         TechnicalModel technicalModel = new TechnicalModel();
         technicalModel.setState(0);
         technicalModel.setId(id);
         technicalModelMapper.updateById(technicalModel);
+        //鍒犻櫎鐢熶骇宸ヨ壓
+        techniqueModelMapper.delTechById(id);
     }
 
     //鎵归噺鍒犻櫎
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delAllTech(String ids) {
         technicalModelMapper.delAllTech(ids);
+        techniqueModelMapper.delAllTech(ids);
     }
 }
 
diff --git a/base-server/src/main/resources/mapper/DeviceMapper.xml b/base-server/src/main/resources/mapper/DeviceMapper.xml
index 166307e..02e3d4f 100644
--- a/base-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/base-server/src/main/resources/mapper/DeviceMapper.xml
@@ -8,7 +8,7 @@
         WHERE d.state = 1
         AND d.type = #{type}
         <if test="search_class !=null and search_class != ''">
-            AND d.`name` like concat('%',#{search_class},'%')
+            AND d.`father` like concat('%',#{search_class},'%')
         </if>
     </select>
     <!--鏌ヨ璁惧缁存姢 鍙充晶鍒楄〃灞曠ず璇ヨ澶囩粍涓嬬殑鎵�鏈夎澶�-->
@@ -30,7 +30,7 @@
         </if>
         <if test="message!=null and message!=''">
             and code like concat('%',#{message},'%')
-            or device.name like concat('%',#{message},'%')
+            and device.name like concat('%',#{message},'%')
         </if>
     </select>
     <!--鏍规嵁璁惧鍒嗙粍鏌ヨ璁惧-->
diff --git a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
index b337acc..a094f05 100644
--- a/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
+++ b/base-server/src/main/resources/mapper/TechniqueModelMapper.xml
@@ -12,6 +12,18 @@
         <result property="unit" column="unit"/>
         <result property="name" column="name"/>
     </resultMap>
+    <!--鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎-->
+    <update id="delTechById">
+        update mom_ocean.technique_model
+        set state=0
+        where technical_model_id = #{id}
+    </update>
+    <!--鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎-->
+    <update id="delAllTech">
+        update mom_ocean.technique_model
+        set state=0
+        where technical_model_id in (${id})
+    </update>
     <select id="selectAllTeque" resultMap="selectAllTequeMap">
         select d.name dname,
                qm.id,
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 9415e88..7c686cf 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
@@ -43,15 +43,15 @@
 
     @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 = "productCategories",value = "浜у搧澶х被",dataTypeClass  = Integer.class),
+            @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 = "productCategories", value = "浜у搧澶х被", dataTypeClass = Integer.class),
     })
     @GetMapping("/selectUnRawInspectsList")
-    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);
+    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());
@@ -60,20 +60,20 @@
 
     @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 = "productName",value = "浜у搧鍚嶇О",dataTypeClass  = String.class),
-            @ApiImplicitParam(name = "supplier",value = "渚涘簲鍟�",dataTypeClass  = String.class),
-            @ApiImplicitParam(name = "processingStatus",value = "澶勭悊鐘舵��",dataTypeClass  = Integer.class)
+            @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 = "productName", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "supplier", value = "渚涘簲鍟�", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "processingStatus", value = "澶勭悊鐘舵��", dataTypeClass = Integer.class)
     })
     @GetMapping("/selectURawMaterials")
     public Result<?> selectUnqualifiedRawMaterials(int pageSize,
-                                             int countSize,
-                                             String formTime,
-                                             String productName,
-                                             String supplier,
-                                             Integer processingStatus){
+                                                   int countSize,
+                                                   String formTime,
+                                                   String productName,
+                                                   String supplier,
+                                                   Integer processingStatus) {
         IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
                 new Page<Object>(pageSize, countSize),
                 formTime,
@@ -88,11 +88,14 @@
 
     @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)
+            @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){
+    public Result<?> rawEvaluate(Integer rawId, Integer passOrNo) {
+        if (inspectUnacceptedService.getById(rawId).getDealState() == 1) {
+            return Result.fail("宸茬粡璇勫杩囦簡涓嶈兘鍐嶆璇勫!");
+        }
         Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
         if (integer >= 1) {
             return Result.success("璇勫鎴愬姛锛�");
@@ -102,12 +105,12 @@
 
     @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 = "specificationModel",value = "瑙勬牸鍨嬪彿",dataTypeClass  = String.class),
-            @ApiImplicitParam(name = "productName",value = "浜у搧鍚嶇О",dataTypeClass  = String.class),
-            @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass  = Integer.class),
-            @ApiImplicitParam(name = "state",value = "鐘舵��",dataTypeClass  = Integer.class)
+            @ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "specificationModel", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "productName", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
+            @ApiImplicitParam(name = "productCategories", value = "浜у搧澶х被", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = "state", value = "鐘舵��", dataTypeClass = Integer.class)
     })
     @GetMapping("/selectDisposal")
     public Result<?> selectDisposal(int pageSize,
@@ -115,7 +118,7 @@
                                     String specificationModel,
                                     String productName,
                                     Integer productCategories,
-                                    Integer state){
+                                    Integer state) {
         IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
                 new Page<Object>(pageSize, countSize),
                 specificationModel,
@@ -140,7 +143,7 @@
 
     @ApiOperation(value = "鏌ョ湅缂栬緫鎰忚", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "rawUnacceptedId",value = "涓嶅悎鏍煎搧澶勭疆Id",dataTypeClass  = Integer.class,required = true)
+            @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/viewEditorial")
     public Result<?> viewEditorialComments(Integer rawUnacceptedId) {
@@ -149,8 +152,8 @@
 
     @ApiOperation(value = "澶辩劍鏇存柊鐜板儚鎻忚堪", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "rawUnacceptedId",value = "涓嶅悎鏍煎搧澶勭疆Id",dataTypeClass  = Integer.class,required = true),
-            @ApiImplicitParam(name = "tell",value = "鐜拌薄鎻忚堪",dataTypeClass  = Integer.class,required = true)
+            @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true),
+            @ApiImplicitParam(name = "tell", value = "鐜拌薄鎻忚堪", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/descriptionUpdate")
     public Result<?> descriptionUpdate(Integer rawUnacceptedId, String tell) {
@@ -163,7 +166,7 @@
 
     @ApiOperation(value = "鐐瑰嚮缂栬緫鎰忚瑙﹀彂鏌ヨ", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "rawUnacceptedId",value = "涓嶅悎鏍煎搧澶勭疆Id",dataTypeClass  = Integer.class,required = true)
+            @ApiImplicitParam(name = "rawUnacceptedId", value = "涓嶅悎鏍煎搧澶勭疆Id", dataTypeClass = Integer.class, required = true)
     })
     @GetMapping("/clickEditing")
     public Result<?> clickEditingTriggerQuery(@RequestParam("rawUnacceptedId") Integer rawUnacceptedId) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index 1bd912b..9c81d03 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -54,6 +54,7 @@
      */
     Integer descriptionUpdate(Integer rawUnacceptedId, String tell);
 
+    //璇勫
     Integer rawEvaluate(Integer rawId, Integer passOrNo);
 }
 
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index ea412f4..3953455 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -6,12 +6,17 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
+import com.yuanchu.mom.mapper.OpinionMapper;
 import com.yuanchu.mom.pojo.InspectUnaccepted;
+import com.yuanchu.mom.pojo.Opinion;
 import com.yuanchu.mom.service.InspectUnacceptedService;
+import com.yuanchu.mom.service.OpinionService;
 import com.yuanchu.mom.vo.Result;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,6 +30,9 @@
 
     @Resource
     InspectUnacceptedMapper inspectUnacceptedMapper;
+
+    @Resource
+    OpinionService opinionService;
 
     //鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
     @Override
@@ -50,12 +58,24 @@
         return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
     }
 
+    //璇勫
     @Override
     public Integer rawEvaluate(Integer rawId, Integer passOrNo) {
         LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
                 .eq(InspectUnaccepted::getId, rawId)
                 .set(InspectUnaccepted::getDealReasult, passOrNo)
-                .set(InspectUnaccepted::getDealState, passOrNo);
+                .set(InspectUnaccepted::getDealState, 1);
+        //濡傛灉鏄瘎瀹′笉閫氳繃鍒欐柊澧炰笉鍚堟牸澶勭悊鎰忚琛�
+        if (passOrNo==0) {
+            List<Opinion> opinions = new ArrayList<>();
+            for (int i = 0; i <= 3; i++) {
+                Opinion opinion = new Opinion();
+                opinion.setType(i);
+                opinion.setRawUnacceptedId(rawId);
+                opinions.add(opinion);
+            }
+            opinionService.saveBatch(opinions);
+        }
         return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
     }
 }
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
index 7f4ba7f..f56d37a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
@@ -35,8 +35,6 @@
     @Resource
     private OpinionMapper opinionMapper;
 
-    @Resource
-    private InspectUnacceptedService inspectUnacceptedService;
 
     @Override
     public List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId) {
@@ -68,7 +66,6 @@
                 throw new RuntimeException(e);
             }
         });
-        MyUtil.PrintLog(list.get(1).getRawUnacceptedId().toString());
         return opinionMapper.updateOpinion(list);
     }
 
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechniqueMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechniqueMapper.java
index 913cdb1..759a7d4 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/TechniqueMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/TechniqueMapper.java
@@ -46,5 +46,11 @@
 
     //鏍规嵁id鏌ョ湅璇︽儏
     List<Map<String, Object>> selTeqById(Integer id);
+
+    //鏍规嵁鎶�鏈寚鏍噄d鍒犻櫎
+    void delByProId(Integer id);
+
+    //鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎
+    void delAll(String ids);
 }
 
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index 8f60368..c0424b4 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.mapper.TechniqueMapper;
 import com.yuanchu.mom.mapper.TechnologyMapper;
 import com.yuanchu.mom.pojo.Product;
 import com.yuanchu.mom.pojo.dto.ProductDto;
@@ -9,6 +10,8 @@
 import com.yuanchu.mom.mapper.ProductMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +29,9 @@
 
     @Resource
     TechnologyMapper technologyMapper;
+
+    @Resource
+    TechniqueMapper techniqueMapper;
 
     //鏍规嵁鍨嬪彿id鏌ヨ椤圭洰(鎶�鏈寚鏍�)
     @Override
@@ -102,17 +108,25 @@
 
     //鍒犻櫎
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delProById(Integer id) {
+        //鍒犻櫎鎶�鏈寚鏍�
         Product product = new Product();
         product.setId(id);
         product.setState(0);
         productMapper.updateById(product);
+        //鍒犻櫎鐢熶骇宸ヨ壓
+        techniqueMapper.delByProId(id);
     }
 
     //鎵归噺鍒犻櫎
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delAllPro(String ids) {
+        //鎵归噺鍒犻櫎鎶�鏈寚鏍�
         productMapper.delAllPro(ids);
+        //鍒犻櫎鐢熶骇宸ヨ壓
+        techniqueMapper.delAll(ids);
     }
 
     //鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
diff --git a/standard-server/src/main/resources/mapper/TechniqueMapper.xml b/standard-server/src/main/resources/mapper/TechniqueMapper.xml
index e6c0e9c..cb02dc1 100644
--- a/standard-server/src/main/resources/mapper/TechniqueMapper.xml
+++ b/standard-server/src/main/resources/mapper/TechniqueMapper.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yuanchu.mom.mapper.TechniqueMapper">
+    <!--鏍规嵁鎶�鏈寚鏍噄d鍒犻櫎-->
+    <update id="delByProId">
+        update mom_ocean.technique
+        set state=0
+        where technology_id = (select technology_id from mom_ocean.product where product.id = #{id})
+          and product_father = (select father from mom_ocean.product where product.id = #{id})
+          and product = (select name from mom_ocean.product where product.id = #{id})
+    </update>
+    <!--鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎-->
+    <update id="delAll">
+        update mom_ocean.technique
+        set state=0
+        where technology_id in (select technology_id from mom_ocean.product where product.id in (${ids}))
+          and product_father in (select father from mom_ocean.product where product.id in (${ids}))
+          and product in (select name from mom_ocean.product where product.id in (${ids}))
+    </update>
     <!--鏍规嵁鍨嬪彿id鏌ヨ鎵�鏈夌増鏈�-->
     <select id="selectVerByTeq" resultType="java.lang.Integer">
         select distinct version

--
Gitblit v1.9.3