票务规则

songhua-admin/src/main/java/com/songhua/web/controller/system/PzTicketTypeManagementController.java

@@ -28,7 +28,7 @@ public class PzTicketTypeManagementController extends BaseController {
     private IPzTicketTypeManagementService pzTicketTypeManagementService;
 
     /**
-     * 查询票种管理列表
+     * 查询票种管理分页列表
      */
     @PreAuthorize("@ss.hasPermi('system:management:list')")
     @GetMapping("/list")
@@ -88,4 +88,14 @@ public class PzTicketTypeManagementController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(pzTicketTypeManagementService.deletePzTicketTypeManagementByIds(ids));
     }
+
+    /**
+     * 查询票种管理列表
+     */
+    @GetMapping("/ticketAllList")
+    public AjaxResult ticketAllList() {
+        PzTicketTypeManagement pzTicketTypeManagement = new PzTicketTypeManagement();
+        return success(pzTicketTypeManagementService.selectPzTicketTypeManagementList(pzTicketTypeManagement));
+    }
+
 }

songhua-admin/src/main/java/com/songhua/web/controller/system/ShhTicketRulesController.java

@@ -9,7 +9,6 @@ import com.songhua.common.utils.poi.ExcelUtil;
 import com.songhua.system.domain.ShhTicketRules;
 import com.songhua.system.service.IShhTicketRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;

songhua-admin/src/main/java/com/songhua/web/controller/system/ShhTicketRulesDataController.java

@@ -1,85 +0,0 @@
-package com.songhua.web.controller.system;
-
-import com.songhua.common.annotation.Log;
-import com.songhua.common.core.controller.BaseController;
-import com.songhua.common.core.domain.AjaxResult;
-import com.songhua.common.core.page.TableDataInfo;
-import com.songhua.common.enums.BusinessType;
-import com.songhua.common.utils.poi.ExcelUtil;
-import com.songhua.system.domain.ShhTicketRulesData;
-import com.songhua.system.service.IShhTicketRulesDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 票种规则子Controller
- *
- * @author ruoyi
- * @date 2024-11-04
- */
-@RestController
-@RequestMapping("/ticket/rules/data")
-public class ShhTicketRulesDataController extends BaseController {
-    @Autowired
-    private IShhTicketRulesDataService shhTicketRulesDataService;
-
-    /**
-     * 查询票种规则子列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(ShhTicketRulesData shhTicketRulesData) {
-        startPage();
-        List<ShhTicketRulesData> list = shhTicketRulesDataService.selectShhTicketRulesDataList(shhTicketRulesData);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出票种规则子列表
-     */
-    @Log(title = "票种规则子", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ShhTicketRulesData shhTicketRulesData) {
-        List<ShhTicketRulesData> list = shhTicketRulesDataService.selectShhTicketRulesDataList(shhTicketRulesData);
-        ExcelUtil<ShhTicketRulesData> util = new ExcelUtil<ShhTicketRulesData>(ShhTicketRulesData.class);
-        util.exportExcel(response, list, "票种规则子数据");
-    }
-
-    /**
-     * 获取票种规则子详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(shhTicketRulesDataService.selectShhTicketRulesDataById(id));
-    }
-
-    /**
-     * 新增票种规则子
-     */
-    @Log(title = "票种规则子", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody ShhTicketRulesData shhTicketRulesData) {
-        return toAjax(shhTicketRulesDataService.insertShhTicketRulesData(shhTicketRulesData));
-    }
-
-    /**
-     * 修改票种规则子
-     */
-    @Log(title = "票种规则子", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody ShhTicketRulesData shhTicketRulesData) {
-        return toAjax(shhTicketRulesDataService.updateShhTicketRulesData(shhTicketRulesData));
-    }
-
-    /**
-     * 删除票种规则子
-     */
-    @Log(title = "票种规则子", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(shhTicketRulesDataService.deleteShhTicketRulesDataByIds(ids));
-    }
-}

songhua-system/src/main/java/com/songhua/system/domain/ShhTicketRules.java

@@ -5,12 +5,16 @@ import com.songhua.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 票种规则对象 shh_ticket_rules
  *
  * @author ruoyi
  * @date 2024-11-04
  */
+
 public class ShhTicketRules extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -25,6 +29,21 @@ public class ShhTicketRules extends BaseEntity {
     @Excel(name = "票务规则名称")
     private String ticketRules;
 
+    /**
+     * 票种id
+     */
+    private String ticketId;
+
+    /**
+     * 票种
+     */
+    private String ticketName;
+
+    /**
+     * 票种集合
+     */
+    private List<Long> ticketList;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -41,11 +60,38 @@ public class ShhTicketRules extends BaseEntity {
         return ticketRules;
     }
 
+    public void setTicketName(String ticketName) {
+        this.ticketName = ticketName;
+    }
+
+    public String getTicketName() {
+        return ticketName;
+    }
+
+    public void setTicketId(String ticketId) {
+        this.ticketId = ticketId;
+    }
+
+    public String getTicketId() {
+        return ticketId;
+    }
+
+    public void setTicketList(List<Long> ticketList) {
+        this.ticketList = ticketList;
+    }
+
+    public List<Long> getTicketList() {
+        return ticketList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("ticketRules", getTicketRules())
+                .append("ticketId", getTicketId())
+                .append("ticketName", getTicketName())
+                .append("ticketList", getTicketList())
                 .toString();
     }
 }

songhua-system/src/main/java/com/songhua/system/mapper/PzTicketTypeManagementMapper.java

@@ -1,19 +1,19 @@
 package com.songhua.system.mapper;
 
-import java.util.List;
 import com.songhua.system.domain.PzTicketTypeManagement;
 
+import java.util.List;
+
 /**
  * 票种管理Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2024-11-04
  */
-public interface PzTicketTypeManagementMapper 
-{
+public interface PzTicketTypeManagementMapper {
     /**
      * 查询票种管理
-     * 
+     *
      * @param id 票种管理主键
      * @return 票种管理
      */
@@ -21,7 +21,7 @@ public interface PzTicketTypeManagementMapper
 
     /**
      * 查询票种管理列表
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 票种管理集合
      */
@@ -29,7 +29,7 @@ public interface PzTicketTypeManagementMapper
 
     /**
      * 新增票种管理
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface PzTicketTypeManagementMapper
 
     /**
      * 修改票种管理
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface PzTicketTypeManagementMapper
 
     /**
      * 删除票种管理
-     * 
+     *
      * @param id 票种管理主键
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface PzTicketTypeManagementMapper
 
     /**
      * 批量删除票种管理
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

songhua-system/src/main/java/com/songhua/system/mapper/ShhTicketRulesDataMapper.java

@@ -1,6 +1,8 @@
 package com.songhua.system.mapper;
 
+import com.songhua.system.domain.ShhTicketRules;
 import com.songhua.system.domain.ShhTicketRulesData;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -58,4 +60,10 @@ public interface ShhTicketRulesDataMapper {
      * @return 结果
      */
     public int deleteShhTicketRulesDataByIds(Long[] ids);
+
+    void insertTicketRulesDataBatch(List<ShhTicketRulesData> list);
+
+
+    public int deleteShhTicketRulesDataByRulesId(@Param("rulesId") Long rulesId);
+
 }

songhua-system/src/main/java/com/songhua/system/service/IPzTicketTypeManagementService.java

@@ -1,19 +1,19 @@
 package com.songhua.system.service;
 
-import java.util.List;
 import com.songhua.system.domain.PzTicketTypeManagement;
 
+import java.util.List;
+
 /**
  * 票种管理Service接口
- * 
+ *
  * @author ruoyi
  * @date 2024-11-04
  */
-public interface IPzTicketTypeManagementService 
-{
+public interface IPzTicketTypeManagementService {
     /**
      * 查询票种管理
-     * 
+     *
      * @param id 票种管理主键
      * @return 票种管理
      */
@@ -21,7 +21,7 @@ public interface IPzTicketTypeManagementService
 
     /**
      * 查询票种管理列表
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 票种管理集合
      */
@@ -29,7 +29,7 @@ public interface IPzTicketTypeManagementService
 
     /**
      * 新增票种管理
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IPzTicketTypeManagementService
 
     /**
      * 修改票种管理
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IPzTicketTypeManagementService
 
     /**
      * 批量删除票种管理
-     * 
+     *
      * @param ids 需要删除的票种管理主键集合
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IPzTicketTypeManagementService
 
     /**
      * 删除票种管理信息
-     * 
+     *
      * @param id 票种管理主键
      * @return 结果
      */

songhua-system/src/main/java/com/songhua/system/service/IShhTicketRulesDataService.java

@@ -1,61 +0,0 @@
-package com.songhua.system.service;
-
-import com.songhua.system.domain.ShhTicketRulesData;
-
-import java.util.List;
-
-/**
- * 票种规则子Service接口
- *
- * @author ruoyi
- * @date 2024-11-04
- */
-public interface IShhTicketRulesDataService {
-    /**
-     * 查询票种规则子
-     *
-     * @param id 票种规则子主键
-     * @return 票种规则子
-     */
-    public ShhTicketRulesData selectShhTicketRulesDataById(Long id);
-
-    /**
-     * 查询票种规则子列表
-     *
-     * @param shhTicketRulesData 票种规则子
-     * @return 票种规则子集合
-     */
-    public List<ShhTicketRulesData> selectShhTicketRulesDataList(ShhTicketRulesData shhTicketRulesData);
-
-    /**
-     * 新增票种规则子
-     *
-     * @param shhTicketRulesData 票种规则子
-     * @return 结果
-     */
-    public int insertShhTicketRulesData(ShhTicketRulesData shhTicketRulesData);
-
-    /**
-     * 修改票种规则子
-     *
-     * @param shhTicketRulesData 票种规则子
-     * @return 结果
-     */
-    public int updateShhTicketRulesData(ShhTicketRulesData shhTicketRulesData);
-
-    /**
-     * 批量删除票种规则子
-     *
-     * @param ids 需要删除的票种规则子主键集合
-     * @return 结果
-     */
-    public int deleteShhTicketRulesDataByIds(Long[] ids);
-
-    /**
-     * 删除票种规则子信息
-     *
-     * @param id 票种规则子主键
-     * @return 结果
-     */
-    public int deleteShhTicketRulesDataById(Long id);
-}

songhua-system/src/main/java/com/songhua/system/service/impl/PzTicketTypeManagementServiceImpl.java

@@ -1,93 +1,87 @@
 package com.songhua.system.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.songhua.system.mapper.PzTicketTypeManagementMapper;
 import com.songhua.system.domain.PzTicketTypeManagement;
+import com.songhua.system.mapper.PzTicketTypeManagementMapper;
 import com.songhua.system.service.IPzTicketTypeManagementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * 票种管理Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2024-11-04
  */
 @Service
-public class PzTicketTypeManagementServiceImpl implements IPzTicketTypeManagementService 
-{
+public class PzTicketTypeManagementServiceImpl implements IPzTicketTypeManagementService {
     @Autowired
     private PzTicketTypeManagementMapper pzTicketTypeManagementMapper;
 
     /**
      * 查询票种管理
-     * 
+     *
      * @param id 票种管理主键
      * @return 票种管理
      */
     @Override
-    public PzTicketTypeManagement selectPzTicketTypeManagementById(Long id)
-    {
+    public PzTicketTypeManagement selectPzTicketTypeManagementById(Long id) {
         return pzTicketTypeManagementMapper.selectPzTicketTypeManagementById(id);
     }
 
     /**
      * 查询票种管理列表
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 票种管理
      */
     @Override
-    public List<PzTicketTypeManagement> selectPzTicketTypeManagementList(PzTicketTypeManagement pzTicketTypeManagement)
-    {
+    public List<PzTicketTypeManagement> selectPzTicketTypeManagementList(PzTicketTypeManagement pzTicketTypeManagement) {
         return pzTicketTypeManagementMapper.selectPzTicketTypeManagementList(pzTicketTypeManagement);
     }
 
     /**
      * 新增票种管理
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 结果
      */
     @Override
-    public int insertPzTicketTypeManagement(PzTicketTypeManagement pzTicketTypeManagement)
-    {
+    public int insertPzTicketTypeManagement(PzTicketTypeManagement pzTicketTypeManagement) {
         return pzTicketTypeManagementMapper.insertPzTicketTypeManagement(pzTicketTypeManagement);
     }
 
     /**
      * 修改票种管理
-     * 
+     *
      * @param pzTicketTypeManagement 票种管理
      * @return 结果
      */
     @Override
-    public int updatePzTicketTypeManagement(PzTicketTypeManagement pzTicketTypeManagement)
-    {
+    public int updatePzTicketTypeManagement(PzTicketTypeManagement pzTicketTypeManagement) {
         return pzTicketTypeManagementMapper.updatePzTicketTypeManagement(pzTicketTypeManagement);
     }
 
     /**
      * 批量删除票种管理
-     * 
+     *
      * @param ids 需要删除的票种管理主键
      * @return 结果
      */
     @Override
-    public int deletePzTicketTypeManagementByIds(Long[] ids)
-    {
+    public int deletePzTicketTypeManagementByIds(Long[] ids) {
         return pzTicketTypeManagementMapper.deletePzTicketTypeManagementByIds(ids);
     }
 
     /**
      * 删除票种管理信息
-     * 
+     *
      * @param id 票种管理主键
      * @return 结果
      */
     @Override
-    public int deletePzTicketTypeManagementById(Long id)
-    {
+    public int deletePzTicketTypeManagementById(Long id) {
         return pzTicketTypeManagementMapper.deletePzTicketTypeManagementById(id);
     }
 }

songhua-system/src/main/java/com/songhua/system/service/impl/ShhTicketRulesDataServiceImpl.java

@@ -1,87 +0,0 @@
-package com.songhua.system.service.impl;
-
-import com.songhua.system.domain.ShhTicketRulesData;
-import com.songhua.system.mapper.ShhTicketRulesDataMapper;
-import com.songhua.system.service.IShhTicketRulesDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 票种规则子Service业务层处理
- *
- * @author ruoyi
- * @date 2024-11-04
- */
-@Service
-public class ShhTicketRulesDataServiceImpl implements IShhTicketRulesDataService {
-    @Autowired
-    private ShhTicketRulesDataMapper shhTicketRulesDataMapper;
-
-    /**
-     * 查询票种规则子
-     *
-     * @param id 票种规则子主键
-     * @return 票种规则子
-     */
-    @Override
-    public ShhTicketRulesData selectShhTicketRulesDataById(Long id) {
-        return shhTicketRulesDataMapper.selectShhTicketRulesDataById(id);
-    }
-
-    /**
-     * 查询票种规则子列表
-     *
-     * @param shhTicketRulesData 票种规则子
-     * @return 票种规则子
-     */
-    @Override
-    public List<ShhTicketRulesData> selectShhTicketRulesDataList(ShhTicketRulesData shhTicketRulesData) {
-        return shhTicketRulesDataMapper.selectShhTicketRulesDataList(shhTicketRulesData);
-    }
-
-    /**
-     * 新增票种规则子
-     *
-     * @param shhTicketRulesData 票种规则子
-     * @return 结果
-     */
-    @Override
-    public int insertShhTicketRulesData(ShhTicketRulesData shhTicketRulesData) {
-        return shhTicketRulesDataMapper.insertShhTicketRulesData(shhTicketRulesData);
-    }
-
-    /**
-     * 修改票种规则子
-     *
-     * @param shhTicketRulesData 票种规则子
-     * @return 结果
-     */
-    @Override
-    public int updateShhTicketRulesData(ShhTicketRulesData shhTicketRulesData) {
-        return shhTicketRulesDataMapper.updateShhTicketRulesData(shhTicketRulesData);
-    }
-
-    /**
-     * 批量删除票种规则子
-     *
-     * @param ids 需要删除的票种规则子主键
-     * @return 结果
-     */
-    @Override
-    public int deleteShhTicketRulesDataByIds(Long[] ids) {
-        return shhTicketRulesDataMapper.deleteShhTicketRulesDataByIds(ids);
-    }
-
-    /**
-     * 删除票种规则子信息
-     *
-     * @param id 票种规则子主键
-     * @return 结果
-     */
-    @Override
-    public int deleteShhTicketRulesDataById(Long id) {
-        return shhTicketRulesDataMapper.deleteShhTicketRulesDataById(id);
-    }
-}

songhua-system/src/main/java/com/songhua/system/service/impl/ShhTicketRulesServiceImpl.java

@@ -1,12 +1,18 @@
 package com.songhua.system.service.impl;
 
 import com.songhua.system.domain.ShhTicketRules;
+import com.songhua.system.domain.ShhTicketRulesData;
+import com.songhua.system.mapper.ShhTicketRulesDataMapper;
 import com.songhua.system.mapper.ShhTicketRulesMapper;
 import com.songhua.system.service.IShhTicketRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 票种规则Service业务层处理
@@ -18,6 +24,8 @@ import java.util.List;
 public class ShhTicketRulesServiceImpl implements IShhTicketRulesService {
     @Autowired
     private ShhTicketRulesMapper shhTicketRulesMapper;
+    @Autowired
+    private ShhTicketRulesDataMapper shhTicketRulesDataMapper;
 
     /**
      * 查询票种规则
@@ -27,7 +35,11 @@ public class ShhTicketRulesServiceImpl implements IShhTicketRulesService {
      */
     @Override
     public ShhTicketRules selectShhTicketRulesById(Long id) {
-        return shhTicketRulesMapper.selectShhTicketRulesById(id);
+        ShhTicketRules returnEntity = shhTicketRulesMapper.selectShhTicketRulesById(id);
+        String[] split = returnEntity.getTicketId().split(",");
+        List<Long> list = Arrays.stream(split).map(Long::parseLong).collect(Collectors.toList());
+        returnEntity.setTicketList(list);
+        return returnEntity;
     }
 
     /**
@@ -49,7 +61,24 @@ public class ShhTicketRulesServiceImpl implements IShhTicketRulesService {
      */
     @Override
     public int insertShhTicketRules(ShhTicketRules shhTicketRules) {
-        return shhTicketRulesMapper.insertShhTicketRules(shhTicketRules);
+        shhTicketRulesMapper.insertShhTicketRules(shhTicketRules);
+        extracted(shhTicketRules);
+        return 1;
+    }
+
+    private void extracted(ShhTicketRules shhTicketRules) {
+        List<ShhTicketRulesData> saveList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(shhTicketRules.getTicketList())) {
+            for (Long var : shhTicketRules.getTicketList()) {
+                ShhTicketRulesData saveData = new ShhTicketRulesData();
+                saveData.setRulesId(shhTicketRules.getId());
+                saveData.setTicketId(var);
+                saveList.add(saveData);
+            }
+            if (!CollectionUtils.isEmpty(saveList)) {
+                shhTicketRulesDataMapper.insertTicketRulesDataBatch(saveList);
+            }
+        }
     }
 
     /**
@@ -60,6 +89,10 @@ public class ShhTicketRulesServiceImpl implements IShhTicketRulesService {
      */
     @Override
     public int updateShhTicketRules(ShhTicketRules shhTicketRules) {
+        if (!CollectionUtils.isEmpty(shhTicketRules.getTicketList())) {
+            shhTicketRulesDataMapper.deleteShhTicketRulesDataByRulesId(shhTicketRules.getId());
+            extracted(shhTicketRules);
+        }
         return shhTicketRulesMapper.updateShhTicketRules(shhTicketRules);
     }
 
@@ -71,6 +104,9 @@ public class ShhTicketRulesServiceImpl implements IShhTicketRulesService {
      */
     @Override
     public int deleteShhTicketRulesByIds(Long[] ids) {
+        for (Long id : ids) {
+            shhTicketRulesDataMapper.deleteShhTicketRulesDataByRulesId(id);
+        }
         return shhTicketRulesMapper.deleteShhTicketRulesByIds(ids);
     }
 
@@ -84,4 +120,6 @@ public class ShhTicketRulesServiceImpl implements IShhTicketRulesService {
     public int deleteShhTicketRulesById(Long id) {
         return shhTicketRulesMapper.deleteShhTicketRulesById(id);
     }
+
+
 }

songhua-system/src/main/resources/mapper/system/PzTicketTypeManagementMapper.xml

@@ -18,11 +18,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPzTicketTypeManagementList" parameterType="PzTicketTypeManagement" resultMap="PzTicketTypeManagementResult">
         <include refid="selectPzTicketTypeManagementVo"/>
-        <where>  
-            <if test="ticketName != null  and ticketName != ''"> and ticket_name like concat('%', #{ticketName}, '%')</if>
-            <if test="ticketType != null  and ticketType != ''"> and ticket_type = #{ticketType}</if>
-            <if test="settlementPrice != null "> and settlement_price = #{settlementPrice}</if>
-            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        <where>
+            <if test="ticketName != null  and ticketName != ''">and ticket_name like concat('%', #{ticketName}, '%')
+            </if>
+            <if test="ticketType != null  and ticketType != ''">and ticket_type = #{ticketType}</if>
+            <if test="settlementPrice != null ">and settlement_price = #{settlementPrice}</if>
+            <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
         </where>
     </select>
     

songhua-system/src/main/resources/mapper/system/ShhTicketRulesDataMapper.xml

@@ -61,4 +61,16 @@
             #{id}
         </foreach>
     </delete>
+    <insert id="insertTicketRulesDataBatch" parameterType="int">
+        insert into shh_ticket_rules_data(rules_id, ticket_id) values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.rulesId}, #{item.ticketId})
+        </foreach>
+    </insert>
+    <delete id="deleteShhTicketRulesDataByRulesId" parameterType="Long">
+        delete
+        from shh_ticket_rules_data
+        where rules_id = #{rulesId}
+    </delete>
+
 </mapper>

songhua-system/src/main/resources/mapper/system/ShhTicketRulesMapper.xml

@@ -15,15 +15,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectShhTicketRulesList" parameterType="ShhTicketRules" resultMap="ShhTicketRulesResult">
-        <include refid="selectShhTicketRulesVo"/>
+        SELECT
+        tr.id,
+        ticket_rules,
+        GROUP_CONCAT( pttm.ticket_name ) AS ticketName
+        FROM
+        shh_ticket_rules tr
+        LEFT JOIN shh_ticket_rules_data trd ON tr.id = trd.rules_id
+        LEFT JOIN pz_ticket_type_management pttm ON trd.ticket_id = pttm.id
         <where>  
-            <if test="ticketRules != null  and ticketRules != ''"> and ticket_rules = #{ticketRules}</if>
+            <if test="ticketRules != null  and ticketRules != ''"> and tr.ticket_rules like concat('%',#{ticketRules},'%')</if>
         </where>
+        GROUP BY
+        tr.id
     </select>
     
     <select id="selectShhTicketRulesById" parameterType="Long" resultMap="ShhTicketRulesResult">
-        <include refid="selectShhTicketRulesVo"/>
-        where id = #{id}
+        select tr.id, ticket_rules, GROUP_CONCAT(trd.ticket_id) as ticketId
+        from shh_ticket_rules tr
+                 left join shh_ticket_rules_data trd on tr.id = trd.rules_id
+        where tr.id = #{id}
+        GROUP BY
+            tr.id
     </select>
         
     <insert id="insertShhTicketRules" parameterType="ShhTicketRules" useGeneratedKeys="true" keyProperty="id">

songhua-ui/src/api/system/ticket.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询票种管理列表
+// 查询票种管理分页列表
 export function listManagement(query) {
   return request({
     url: '/system/ticket/list',
@@ -42,3 +42,12 @@ export function delManagement(id) {
     method: 'delete'
   })
 }
+
+// 查询票种管理列表
+export function ticketAllList(query) {
+  return request({
+    url: '/system/ticket/ticketAllList',
+    method: 'get',
+    params: query
+  })
+}

songhua-ui/src/views/system/ships/index.vue

@@ -186,7 +186,7 @@ export default {
       // 表单校验
       rules: {
         shipName: [
-          { required: true, message: "船名不能为空", trigger: "chablurnge" },
+          { required: true, message: "船名不能为空", trigger: "blur" },
         ],
         registrationNumber: [
           { required: true, message: "船舶注册号不能为空", trigger: "blur" },

songhua-ui/src/views/system/ticketRules/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
       <el-form-item label="票务规则名称" prop="ticketRules">
         <el-input
           v-model="queryParams.ticketRules"
@@ -65,7 +65,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" align="center" type="index"/>
       <el-table-column label="票务规则名称" align="center" prop="ticketRules"/>
-      <el-table-column label="票种名称" align="center" prop="ticketRules"/>
+      <el-table-column label="票种名称" align="center" prop="ticketName"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -96,10 +96,22 @@
 
     <!-- 添加或修改票种规则对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="票务规则名称" prop="ticketRules">
           <el-input v-model="form.ticketRules" placeholder="请输入票务规则名称"/>
         </el-form-item>
+        <el-form-item label="票种名称" prop="ticketList">
+          <el-select v-model="form.ticketList" multiple placeholder="请选择票种名称" style="width:340px"
+                     @change="onChange"
+          >
+            <el-option
+              v-for="item in ticketList"
+              :key="item.index"
+              :label="item.ticketName"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -111,6 +123,7 @@
 
 <script>
 import {listRules, getRules, delRules, addRules, updateRules} from "@/api/system/ticketRules";
+import {ticketAllList} from "@/api/system/ticket";
 
 export default {
   name: "Rules",
@@ -130,6 +143,10 @@ export default {
       total: 0,
       // 票种规则表格数据
       rulesList: [],
+      // 票种数据
+      ticketList: [],
+      // 票种存储数据
+      tickets: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -143,13 +160,34 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {}
+      rules: {
+        ticketRules: [
+          { required: true, message: "票务规则名称不能为空", trigger: "blur" },
+        ],
+        ticketList: [
+          { required: true, message: "票种名称不能为空", trigger: "blur" },
+        ],
+      }
     };
   },
   created() {
     this.getList();
+    this.getTicketList();
   },
   methods: {
+    onChange(e) {
+      this.form.tickets = this.ticketList.filter((item) =>
+        e.includes(item.id)
+      )
+    },
+    /** 查询票种全部列表 */
+    getTicketList() {
+      this.loading = true;
+      ticketAllList().then(response => {
+        this.ticketList = response.data;
+        this.loading = false;
+      });
+    },
     /** 查询票种规则列表 */
     getList() {
       this.loading = true;