Răsfoiți Sursa

保险价格

zhangxin 2 zile în urmă
părinte
comite
f338ddd880
16 a modificat fișierele cu 211 adăugiri și 60 ștergeri
  1. 8 10
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/GameServiceImpl.java
  2. 31 3
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppInsureController.java
  3. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/InsureOrderInfoController.java
  4. 15 33
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/ProtocolController.java
  5. 1 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInsure.java
  6. 74 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/InsurePrice.java
  7. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/InsureOrderInfoMapper.java
  8. 14 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/InsurePriceMapper.java
  9. 3 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/InsureOrderInfoMapper.xml
  10. 5 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/InsurePriceMapper.xml
  11. 1 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/ProtocolMapper.xml
  12. 14 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IInsurePriceService.java
  13. 2 1
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IProtocolService.java
  14. 18 4
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/InsureOrderInfoServiceImpl.java
  15. 19 0
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/InsurePriceServiceImpl.java
  16. 4 2
      national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/ProtocolServiceImpl.java

+ 8 - 10
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/GameServiceImpl.java

@@ -1,10 +1,9 @@
 package org.jeecg.modules.app.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -12,12 +11,14 @@ import org.jeecg.common.util.DictAnnotationUtil;
 import org.jeecg.modules.app.service.IGameService;
 import org.jeecg.modules.app.vo.game.*;
 import org.jeecg.modules.system.app.entity.AppInsure;
+import org.jeecg.modules.system.app.entity.InsurePrice;
 import org.jeecg.modules.system.app.mapper.AppGameMapper;
 import org.jeecg.modules.system.app.mapper.AppGamePriceRulesMapper;
 import org.jeecg.modules.system.app.mapper.AppInsureMapper;
+import org.jeecg.modules.system.app.mapper.InsurePriceMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.fasterxml.jackson.core.type.TypeReference;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -39,6 +40,8 @@ public class GameServiceImpl  implements IGameService {
 
     @Autowired
     private AppInsureMapper appInsureMapper;
+    @Autowired
+    InsurePriceMapper insurePriceMapper;
 
 
     @Override
@@ -108,14 +111,9 @@ public class GameServiceImpl  implements IGameService {
                     .eq(AppInsure::getDelFlag,0);  // 方法引用 + 集合
             List<AppInsure> appInsureList = appInsureMapper.selectList(wrapper);
             DictAnnotationUtil.translateDictList(appInsureList);
-            ObjectMapper objectMapper = new ObjectMapper();
             for (AppInsure appInsure : appInsureList) {
-                try {
-                    List<PriceData> priceData = objectMapper.readValue(appInsure.getPrice(), new TypeReference<List<PriceData>>() {});
-                    appInsure.setPriceDataList(priceData);
-                } catch (JsonProcessingException e) {
-                    return Result.error("保险金额转换失败");
-                }
+                List<InsurePrice> insurePrices = insurePriceMapper.selectList(new QueryWrapper<InsurePrice>().lambda().eq(InsurePrice::getInsureId, appInsure.getId()).eq(InsurePrice::getDelFlag, 0));
+                appInsure.setPriceDataList(insurePrices);
             }
             findByGameIdPriceVo.setInsureIdList(appInsureList);
         }

+ 31 - 3
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/AppInsureController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.utils.UuidUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -14,8 +15,11 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.DictAnnotationUtil;
 import org.jeecg.modules.system.app.entity.AppInsure;
+import org.jeecg.modules.system.app.entity.InsurePrice;
 import org.jeecg.modules.system.app.service.IAppInsureService;
+import org.jeecg.modules.system.app.service.IInsurePriceService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -37,6 +41,9 @@ import java.util.List;
 public class AppInsureController extends JeecgController<AppInsure, IAppInsureService> {
 	@Autowired
 	private IAppInsureService appInsureService;
+
+	@Autowired
+	IInsurePriceService iInsurePriceService;
 	
 	/**
 	 * 分页列表查询
@@ -54,11 +61,15 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-
-
         QueryWrapper<AppInsure> queryWrapper = QueryGenerator.initQueryWrapper(appInsure, req.getParameterMap());
 		Page<AppInsure> page = new Page<AppInsure>(pageNo, pageSize);
 		IPage<AppInsure> pageList = appInsureService.page(page, queryWrapper);
+		if (pageList!=null&&pageList.getRecords()!=null){
+			for (AppInsure record : pageList.getRecords()) {
+				List<InsurePrice> list = iInsurePriceService.list(new QueryWrapper<InsurePrice>().lambda().eq(InsurePrice::getInsureId, record.getId()).eq(InsurePrice::getDelFlag,0));
+				record.setPriceDataList(list);
+			}
+		}
 		return Result.OK(pageList);
 	}
 	
@@ -71,9 +82,17 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 	@AutoLog(value = "保险表-添加")
 	@Operation(summary="保险表-添加")
 	@PostMapping(value = "/add")
+	@Transactional
 	public Result<String> add(@RequestBody AppInsure appInsure) {
+		if (appInsure.getPriceDataList()==null||appInsure.getPriceDataList().size()!=5){
+			return Result.error("保险期限价格错误");
+		}
 		appInsureService.save(appInsure);
-
+		for (InsurePrice insurePrice : appInsure.getPriceDataList()) {
+			insurePrice.setInsureId(appInsure.getId());
+			insurePrice.setId(UuidUtils.getUUID());
+		}
+		iInsurePriceService.saveBatch(appInsure.getPriceDataList());
 		return Result.OK("添加成功!");
 	}
 	
@@ -85,9 +104,14 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 	 */
 	@AutoLog(value = "保险表-编辑")
 	@Operation(summary="保险表-编辑")
+	@Transactional
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody AppInsure appInsure) {
+		if (appInsure.getPriceDataList()==null||appInsure.getPriceDataList().size()!=5){
+			return Result.error("保险期限价格错误");
+		}
 		appInsureService.updateById(appInsure);
+		iInsurePriceService.updateBatchById(appInsure.getPriceDataList());
 		return Result.OK("编辑成功!");
 	}
 	
@@ -100,8 +124,10 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 	@AutoLog(value = "保险表-通过id删除")
 	@Operation(summary="保险表-通过id删除")
 	@DeleteMapping(value = "/delete")
+	@Transactional
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		appInsureService.removeById(id);
+		iInsurePriceService.remove(new QueryWrapper<InsurePrice>().lambda().eq(InsurePrice::getInsureId,id));
 		return Result.OK("删除成功!");
 	}
 	
@@ -134,6 +160,8 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 		if(appInsure==null) {
 			return Result.error("未找到对应数据");
 		}
+		List<InsurePrice> list = iInsurePriceService.list(new QueryWrapper<InsurePrice>().lambda().eq(InsurePrice::getInsureId, appInsure.getId()).eq(InsurePrice::getDelFlag,0));
+		appInsure.setPriceDataList(list);
 		return Result.OK(appInsure);
 	}
 

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/InsureOrderInfoController.java

@@ -100,7 +100,7 @@ public class InsureOrderInfoController extends JeecgController<InsureOrderInfo,
 	 */
 	@AutoLog(value = "保险订单-修改筛选数据")
 	@Operation(summary="保险订单-修改筛选数据")
-	@DeleteMapping(value = "/deleteBatch")
+	@PutMapping(value = "/updateBatch")
 	public Result<String> updateBatch(FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
 		return insureOrderInfoService.updateBatch(findInsureOrderPageRequestDTO);
 	}

+ 15 - 33
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/controller/ProtocolController.java

@@ -1,43 +1,25 @@
 package org.jeecg.modules.system.app.controller;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.protocol.entity.Protocol;
-import org.jeecg.modules.demo.protocol.service.IProtocolService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.system.app.entity.Protocol;
+import org.jeecg.modules.system.app.service.IProtocolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
  /**
  * @Description: 协议说明
  * @Author: jeecg-boot
@@ -65,9 +47,9 @@ public class ProtocolController extends JeecgController<Protocol, IProtocolServi
 	@Operation(summary="协议说明-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<Protocol>> queryPageList(Protocol protocol,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+												 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												 HttpServletRequest req) {
 
 
         QueryWrapper<Protocol> queryWrapper = QueryGenerator.initQueryWrapper(protocol, req.getParameterMap());

+ 1 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppInsure.java

@@ -7,7 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.app.vo.game.PriceData;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -42,8 +41,6 @@ public class AppInsure implements Serializable {
     @Schema(description = "租户id")
     private String tenantId;
 
-    @Schema(description = "价格")
-    private String price;
     @Dict(dicCode = "insurance_name")
     @Schema(description = "保险公司")
     private Integer insuranceName;
@@ -95,5 +92,5 @@ public class AppInsure implements Serializable {
 
     @TableField(exist = false)
     @Schema(description = "保险期限")
-    private List<PriceData> priceDataList;
+    private List<InsurePrice> priceDataList;
 }

+ 74 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/InsurePrice.java

@@ -0,0 +1,74 @@
+package org.jeecg.modules.system.app.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 保险价格
+ * @Author: jeecg-boot
+ * @Date:   2025-07-31
+ * @Version: V1.0
+ */
+@Data
+@TableName("nm_insure_price")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="保险价格")
+public class InsurePrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @Schema(description = "主键id")
+    private String id;
+	/**保险id*/
+	@Excel(name = "保险id", width = 15)
+    @Schema(description = "保险id")
+    private String insureId;
+	/**保险价格*/
+	@Excel(name = "保险价格", width = 15)
+    @Schema(description = "保险价格")
+    private BigDecimal insurePrice;
+	/**天数*/
+	@Excel(name = "天数", width = 15)
+    @Schema(description = "天数")
+    private Integer insureDay;
+	/**创建人;创建人*/
+    @Schema(description = "创建人;创建人")
+    private String createBy;
+	/**创建时间;创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "创建时间;创建时间")
+    private Date createTime;
+	/**更新人;更新人*/
+    @Schema(description = "更新人;更新人")
+    private String updateBy;
+	/**更新时间;更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "更新时间;更新时间")
+    private Date updateTime;
+	/**系统状态;状态(0-正常,1-冻结)*/
+	@Excel(name = "系统状态;状态(0-正常,1-冻结)", width = 15)
+    @Schema(description = "系统状态;状态(0-正常,1-冻结)")
+    private Integer status;
+	/**删除标志;删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除标志;删除状态(0-正常,1-已删除)", width = 15)
+    @Schema(description = "删除标志;删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+}

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/InsureOrderInfoMapper.java

@@ -20,7 +20,7 @@ public interface InsureOrderInfoMapper extends BaseMapper<InsureOrderInfo> {
 
     IPage<FindInsureOrderPageResponseDTO> findPage(@Param("page") Page<FindInsureOrderPageResponseDTO> page,@Param("findInsureOrderPageRequestDTO")  FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO);
 
-    void updateBatch(FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO);
+    void updateBatch(@Param("findInsureOrderPageRequestDTO") FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO);
 
     List<FindInsureOrderPageResponseDTO> findByList(@Param("findInsureOrderPageRequestDTO")  FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO);
 }

+ 14 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/InsurePriceMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.app.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.system.app.entity.InsurePrice;
+
+/**
+ * @Description: 保险价格
+ * @Author: jeecg-boot
+ * @Date:   2025-07-31
+ * @Version: V1.0
+ */
+public interface InsurePriceMapper extends BaseMapper<InsurePrice> {
+
+}

+ 3 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/InsureOrderInfoMapper.xml

@@ -7,6 +7,9 @@
         INNER  join  nm_family_members c on  a.family_members_id = c.id
         SET a.is_enter_system =#{findInsureOrderPageRequestDTO.updateIsEnterSystem}
         where 1=1
+        <if test="findInsureOrderPageRequestDTO.id != null and findInsureOrderPageRequestDTO.id  != ''">
+            AND a.id = #{findInsureOrderPageRequestDTO.id}
+        </if>
         <if test="findInsureOrderPageRequestDTO.bdOrderNo != null and findInsureOrderPageRequestDTO.bdOrderNo != ''">
             AND a.bd_order_no = #{findInsureOrderPageRequestDTO.bdOrderNo}
         </if>

+ 5 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/InsurePriceMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.system.app.mapper.InsurePriceMapper">
+
+</mapper>

+ 1 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/ProtocolMapper.xml

@@ -1,5 +1,5 @@
 <?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="org.jeecg.modules.system.app.protocol.mapper.ProtocolMapper">
+<mapper namespace="org.jeecg.modules.system.app.mapper.ProtocolMapper">
 
 </mapper>

+ 14 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IInsurePriceService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.system.app.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.app.entity.InsurePrice;
+
+/**
+ * @Description: 保险价格
+ * @Author: jeecg-boot
+ * @Date:   2025-07-31
+ * @Version: V1.0
+ */
+public interface IInsurePriceService extends IService<InsurePrice> {
+
+}

+ 2 - 1
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/IProtocolService.java

@@ -1,7 +1,8 @@
 package org.jeecg.modules.system.app.service;
 
-import org.jeecg.modules.demo.protocol.entity.Protocol;
+
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.app.entity.Protocol;
 
 /**
  * @Description: 协议说明

+ 18 - 4
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/InsureOrderInfoServiceImpl.java

@@ -4,6 +4,7 @@ package org.jeecg.modules.system.app.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
@@ -65,10 +66,16 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
     @Transactional
     public Result<String> updateBatch(FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
 
-        if (StringUtils.isEmpty(findInsureOrderPageRequestDTO.getInsureCompany_dictText())
-                &&StringUtils.isEmpty(findInsureOrderPageRequestDTO.getEndTime())
-                &&StringUtils.isEmpty(findInsureOrderPageRequestDTO.getStartTime())){
-            return  Result.error("查询参数保险公司和付款时间不能为空");
+        if (StringUtils.isEmpty(findInsureOrderPageRequestDTO.getId())) {
+            if (StringUtils.isEmpty(findInsureOrderPageRequestDTO.getInsureCompany_dictText())
+                    && StringUtils.isEmpty(findInsureOrderPageRequestDTO.getEndTime())
+                    && StringUtils.isEmpty(findInsureOrderPageRequestDTO.getStartTime())) {
+                return Result.error("查询参数保险公司和付款时间不能为空");
+            }
+        }
+
+        if (ObjectUtils.isEmpty(findInsureOrderPageRequestDTO.getUpdateIsEnterSystem())){
+            return Result.error("修改状态不能为空");
         }
         getFindInsureOrderPageRequestDTO(findInsureOrderPageRequestDTO);
         insureOrderInfoMapper.updateBatch(findInsureOrderPageRequestDTO);
@@ -77,6 +84,13 @@ public class InsureOrderInfoServiceImpl extends ServiceImpl<InsureOrderInfoMappe
 
     @Override
     public void exportXls(HttpServletRequest request, HttpServletResponse response, FindInsureOrderPageRequestDTO findInsureOrderPageRequestDTO) {
+        if (StringUtils.isEmpty(findInsureOrderPageRequestDTO.getId())) {
+            if (StringUtils.isEmpty(findInsureOrderPageRequestDTO.getInsureCompany_dictText())
+                    && StringUtils.isEmpty(findInsureOrderPageRequestDTO.getEndTime())
+                    && StringUtils.isEmpty(findInsureOrderPageRequestDTO.getStartTime())) {
+                throw new JeecgBootException("查询参数保险公司和付款时间不能为空");
+            }
+        }
         String timestamp = String.valueOf(System.currentTimeMillis());
         DictAnnotationUtil.translateDict(findInsureOrderPageRequestDTO);
         String outputFilename = findInsureOrderPageRequestDTO.getInsureCompany_dictText() +"保险订单_被保险人清单_" + timestamp ;

+ 19 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/InsurePriceServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.system.app.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.system.app.entity.InsurePrice;
+import org.jeecg.modules.system.app.mapper.InsurePriceMapper;
+import org.jeecg.modules.system.app.service.IInsurePriceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 保险价格
+ * @Author: jeecg-boot
+ * @Date:   2025-07-31
+ * @Version: V1.0
+ */
+@Service
+public class InsurePriceServiceImpl extends ServiceImpl<InsurePriceMapper, InsurePrice> implements IInsurePriceService {
+
+}

+ 4 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/ProtocolServiceImpl.java

@@ -1,9 +1,11 @@
 package org.jeecg.modules.system.app.service.impl;
 
 
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.system.app.entity.Protocol;
+import org.jeecg.modules.system.app.mapper.ProtocolMapper;
+import org.jeecg.modules.system.app.service.IProtocolService;
+import org.springframework.stereotype.Service;
 
 /**
  * @Description: 协议说明