2024-09-23

src/main/java/com/spring/modules/code/controller/CodeItemValueController.java

@@ -1,6 +1,7 @@
 package com.spring.modules.code.controller;
 
 import com.spring.common.utils.R;
+import com.spring.modules.code.vo.CodeConditionDetailVo;
 import com.spring.modules.code.vo.CodeItemDefVo;
 import com.spring.modules.code.entity.CodeItemValue;
 import com.spring.modules.code.service.CodeItemValueService;
@@ -70,4 +71,10 @@ public class CodeItemValueController {
         List<CodeItemValueVo> list = codeItemValueService.searchCodeItemValueGenerationList(codeItemDefVoList);
         return R.ok().put("rows", list);
     }
+
+    @PostMapping("/detail")
+    public R queryCodeItemValueDetail(@RequestBody CodeItemValue codeItemValue) {
+        List<CodeConditionDetailVo> list = codeItemValueService.queryCodeItemValueDetail(codeItemValue);
+        return R.ok().put("rows", list);
+    }
 }

src/main/java/com/spring/modules/code/service/CodeItemValueService.java

@@ -1,6 +1,7 @@
 package com.spring.modules.code.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.spring.modules.code.vo.CodeConditionDetailVo;
 import com.spring.modules.code.vo.CodeItemDefVo;
 import com.spring.modules.code.entity.CodeItemValue;
 import com.spring.modules.code.vo.CodeItemValueVo;
@@ -25,4 +26,6 @@ public interface CodeItemValueService extends IService<CodeItemValue> {
     List<CodeItemValueVo> searchCodeItemValueListItem(CodeItemValue codeItemValue);
 
     List<CodeItemValueVo> searchCodeItemValueGenerationList(List<CodeItemDefVo> codeItemDefVoList);
+
+    List<CodeConditionDetailVo> queryCodeItemValueDetail(CodeItemValue codeItemValue);
 }

src/main/java/com/spring/modules/code/service/impl/CodeDrawingServiceImpl.java

@@ -133,6 +133,9 @@ public class CodeDrawingServiceImpl extends ServiceImpl<CodeDrawingMapper, CodeD
         List<CodeDrawingDetail> details = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
             CodeItemDefVo codeItem = list.get(i);
+            if (Constant.SYSTEM_ACTIVE_YES.equals(codeItem.getVirtualItem())){
+                continue;
+            }
             CodeDrawingDetail detail = new CodeDrawingDetail();
             detail.setSite(codeItem.getSite());
             detail.setItemNo(codeItem.getItemNo());

src/main/java/com/spring/modules/code/service/impl/CodeItemValueServiceImpl.java

@@ -95,17 +95,11 @@ public class CodeItemValueServiceImpl extends ServiceImpl<CodeItemValueMapper, C
     @Transactional
     public void removeCodeItemValue(CodeItemValue codeItemValue) {
         // 删除校验
-        List<CodeConditionDetailVo> detailList = codeConditionDetailService.queryCodeConditionDetailByValue(codeItemValue.getValueItemNo());
-        if (!detailList.isEmpty()){
-            StringBuilder str = new StringBuilder("元素已被条件:(");
-            for (CodeConditionDetailVo detail : detailList) {
-                str.append(detail.getConditionId()).append("-").append(detail.getConditionName()).append(",");
-            }
-            if (str.length() > 0) {
-                str.deleteCharAt(str.length() - 1);
-            }
-            str.append(")引用");
-            throw new RuntimeException(str.toString());
+        int i = codeConditionDetailService.lambdaQuery()
+                .eq(CodeConditionDetail::getSQLStatementExecuteValueItemNo, codeItemValue.getValueItemNo())
+                .count();
+        if (i > 0){
+            throw new RuntimeException("元素已经被条件设置中引用，因此不能删除，具体参看<被引用的条件>");
         }
         lambdaUpdate()
                 .eq(CodeItemValue::getItemNo, codeItemValue.getItemNo())
@@ -279,4 +273,10 @@ public class CodeItemValueServiceImpl extends ServiceImpl<CodeItemValueMapper, C
                 .eq(CodeConditionDetail::getItemNo, header.getItemNo())
                 .orderByAsc(CodeConditionDetail::getSQLStatementExecuteItem).list();
     }
+
+
+    @Override
+    public List<CodeConditionDetailVo> queryCodeItemValueDetail(CodeItemValue codeItemValue) {
+        return codeConditionDetailService.queryCodeConditionDetailByValue(codeItemValue.getValueItemNo());
+    }
 }

src/main/java/com/spring/modules/code/vo/CodeConditionDetailVo.java

@@ -13,4 +13,6 @@ public class CodeConditionDetailVo extends CodeConditionDetail {
     private String itemValue;
 
     private String conditionName;
+
+    private String conditionDesc;
 }

src/main/resources/mapper/code/CodeConditionDetailMapper.xml

@@ -137,16 +137,13 @@
         select d.site,
                d.item_no,
                d.condition_id,
-               d.seq_no,
-               d.SQL_statement_execute_item,
-               d.SQL_statement_execute_value,
-               d.SQL_statement_execute_calculate,
-               d.SQL_statement_execute_condition_id,
-               d.SQL_statement_execute_value_item_no,
-               d.SQL_statement_execute_flag,
-               h.condition_name
+               h.condition_desc,
+               i.item_desc
         from DC_ItemValueCondition_D d
-        left join DC_ItemValueCondition_H h on d.site = h.site and d.item_no = h.item_no and d.condition_id = h.condition_id
+                 left join DC_ItemValueCondition_H h
+                           on d.site = h.site and d.item_no = h.item_no and d.condition_id = h.condition_id
+                 left join DC_ItemDef i on d.site = i.site and d.item_no = i.item_no
         where SQL_statement_execute_value_item_no = #{valueItemNo}
+        order by d.item_no
     </select>
 </mapper>