Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/agreement/AppProtocolController.java

@@ -0,0 +1,42 @@
+package org.jeecg.modules.app.controller.agreement;
+
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVORequest;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVoResponse;
+import org.jeecg.modules.system.app.service.IProtocolService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 意见反馈
+ */
+@Slf4j
+@Tag(name = "app协议相关接口")
+@RestController()
+@RequestMapping("/app/my/feedback")
+public class AppProtocolController {
+
+    @Autowired
+    IProtocolService iProtocolService;
+
+
+    /**
+     * 协议查询接口
+     * @param appAgreementVORequest
+     * @return
+     */
+    @GetMapping("/findByType")
+    @Operation(summary = "协议查询接口")
+    public Result<AppAgreementVoResponse> findByType(AppAgreementVORequest appAgreementVORequest){
+        return iProtocolService.findByType(appAgreementVORequest);
+    }
+
+
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/agreement/AppAgreementVORequest.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.app.vo.agreement;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="首页轮播图管理")
+public class AppAgreementVORequest {
+    /**事件值*/
+    @Schema(description = "保险公司编码")
+    private Integer insuranceName;
+    /**图片地址*/
+    @Schema(description = "协议类型")
+    private String protocolType;
+}

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/agreement/AppAgreementVoResponse.java

@@ -0,0 +1,41 @@
+package org.jeecg.modules.app.vo.agreement;
+
+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;
+
+/**
+ * @Description: 协议说明
+ * @Author: jeecg-boot
+ * @Date:   2025-07-31
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="首页轮播图管理")
+public class AppAgreementVoResponse {
+
+	/**协议类型*/
+	@Excel(name = "协议类型", width = 15)
+    @Schema(description = "协议类型")
+    private Integer protocolType;
+	/**保险公司*/
+	@Excel(name = "保险公司", width = 15)
+    @Schema(description = "保险公司")
+    private Integer insuranceName;
+	/**协议名称*/
+	@Excel(name = "协议名称", width = 15)
+    @Schema(description = "协议名称")
+    private String protocolName;
+	/**协议内容*/
+	@Excel(name = "协议内容", width = 15)
+    @Schema(description = "协议内容")
+    private String protocolContent;
+	/**说明*/
+	@Excel(name = "说明", width = 15)
+    @Schema(description = "说明")
+    private String description;
+}

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

@@ -8,11 +8,13 @@ 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.SecurityUtils;
 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.common.system.vo.LoginUser;
 import org.jeecg.common.util.DictAnnotationUtil;
 import org.jeecg.modules.system.app.entity.AppInsure;
 import org.jeecg.modules.system.app.entity.InsurePrice;
@@ -87,6 +89,9 @@ public class AppInsureController extends JeecgController<AppInsure, IAppInsureSe
 		if (appInsure.getPriceDataList()==null||appInsure.getPriceDataList().size()!=5){
 			return Result.error("保险期限价格错误");
 		}
+		LoginUser principal = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		appInsure.setOrgCode(principal.getOrgCode());
+		appInsure.setTenantId(principal.getOrgId());
 		appInsureService.save(appInsure);
 		for (InsurePrice insurePrice : appInsure.getPriceDataList()) {
 			insurePrice.setInsureId(appInsure.getId());

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

@@ -66,9 +66,13 @@ public class ProtocolController extends JeecgController<Protocol, IProtocolServi
 	 */
 	@AutoLog(value = "协议说明-添加")
 	@Operation(summary="协议说明-添加")
-	@RequiresPermissions("protocol:nm_protocol:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Protocol protocol) {
+
+		Protocol protocolNew =	protocolService.findByInsuranceName(protocol.getInsuranceName(),null);
+		if (protocolNew!=null){
+			return Result.error("添加失败！该保险公司已存在");
+		}
 		protocolService.save(protocol);
 
 		return Result.OK("添加成功！");
@@ -82,9 +86,12 @@ public class ProtocolController extends JeecgController<Protocol, IProtocolServi
 	 */
 	@AutoLog(value = "协议说明-编辑")
 	@Operation(summary="协议说明-编辑")
-	@RequiresPermissions("protocol:nm_protocol:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Protocol protocol) {
+		Protocol protocolNew =	protocolService.findByInsuranceName(protocol.getInsuranceName(),protocol.getId());
+		if (protocolNew!=null){
+			return Result.error("修改失败！该保险公司已存在");
+		}
 		protocolService.updateById(protocol);
 		return Result.OK("编辑成功!");
 	}
@@ -97,7 +104,6 @@ public class ProtocolController extends JeecgController<Protocol, IProtocolServi
 	 */
 	@AutoLog(value = "协议说明-通过id删除")
 	@Operation(summary="协议说明-通过id删除")
-	@RequiresPermissions("protocol:nm_protocol:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		protocolService.removeById(id);
@@ -112,7 +118,6 @@ public class ProtocolController extends JeecgController<Protocol, IProtocolServi
 	 */
 	@AutoLog(value = "协议说明-批量删除")
 	@Operation(summary="协议说明-批量删除")
-	@RequiresPermissions("protocol:nm_protocol:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.protocolService.removeByIds(Arrays.asList(ids.split(",")));

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/Protocol.java

@@ -1,23 +1,20 @@
 package org.jeecg.modules.system.app.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import org.jeecg.common.constant.ProvinceCityArea;
-import org.jeecg.common.util.SpringContextUtils;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 协议说明
@@ -38,10 +35,12 @@ public class Protocol implements Serializable {
     @Schema(description = "主键id")
     private String id;
 	/**协议类型*/
+    @Dict(dicCode = "protocol_type")
 	@Excel(name = "协议类型", width = 15)
     @Schema(description = "协议类型")
-    private Integer protocol;
+    private Integer protocolType;
 	/**保险公司*/
+    @Dict(dicCode = "insurance_name")
 	@Excel(name = "保险公司", width = 15)
     @Schema(description = "保险公司")
     private Integer insuranceName;
@@ -56,7 +55,7 @@ public class Protocol implements Serializable {
 	/**说明*/
 	@Excel(name = "说明", width = 15)
     @Schema(description = "说明")
-    private String describe;
+    private String description;
 	/**创建人;创建人*/
     @Schema(description = "创建人;创建人")
     private String createBy;

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

@@ -1,10 +1,10 @@
 package org.jeecg.modules.system.app.mapper;
 
-import java.util.List;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVORequest;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVoResponse;
 import org.jeecg.modules.system.app.entity.Protocol;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Description: 协议说明
@@ -14,4 +14,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ProtocolMapper extends BaseMapper<Protocol> {
 
+
+    Protocol findByInsuranceName(@Param("insuranceName") Integer insuranceName,@Param("id") String id);
+
+    AppAgreementVoResponse findByType(@Param("appAgreementVORequest") AppAgreementVORequest appAgreementVORequest);
 }

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

@@ -72,6 +72,7 @@
         <if test="findInsureOrderPageRequestDTO.startTime!=null  and findInsureOrderPageRequestDTO.startTime!=''">
             <![CDATA[   AND DATE_FORMAT(b.pay_time, '%Y-%m-%d')>=  DATE_FORMAT(#{findInsureOrderPageRequestDTO.startTime}, '%Y-%m-%d') ]]>
         </if>
+        order by b.pay_time desc
     </select>
     <select id="findByList"
             resultType="org.jeecg.modules.system.app.dto.insureOrder.FindInsureOrderPageResponseDTO">

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

@@ -2,4 +2,23 @@
 <!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.ProtocolMapper">
 
+    <select id="findByType" resultType="org.jeecg.modules.app.vo.agreement.AppAgreementVoResponse">
+        select  * from nm_protocol where del_flag=0
+        <if test="appAgreementVORequest!=null">
+            <if test="appAgreementVORequest.insuranceName!=null and appAgreementVORequest.insuranceName != ''">
+                and insurance_name = #{appAgreementVORequest.insuranceName}
+            </if>
+            <if test="appAgreementVORequest.protocolType!=null and appAgreementVORequest.protocolType != ''">
+                and protocol_type = #{appAgreementVORequest.protocolType}
+            </if>
+        </if>
+        limit 1
+    </select>
+    <select id="findByInsuranceName" resultType="org.jeecg.modules.system.app.entity.Protocol">
+        select * from nm_protocol where del_flag=0 and insurance_name = #{insuranceName}
+        <if test="id!=null and id != ''">
+            and id != #{id}
+        </if>
+        limit 1
+    </select>
 </mapper>

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

@@ -2,6 +2,9 @@ package org.jeecg.modules.system.app.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVORequest;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVoResponse;
 import org.jeecg.modules.system.app.entity.Protocol;
 
 /**
@@ -12,4 +15,7 @@ import org.jeecg.modules.system.app.entity.Protocol;
  */
 public interface IProtocolService extends IService<Protocol> {
 
+    Protocol findByInsuranceName(Integer insuranceName,String id);
+
+    Result<AppAgreementVoResponse> findByType(AppAgreementVORequest appAgreementVORequest);
 }

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

@@ -2,9 +2,14 @@ package org.jeecg.modules.system.app.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVORequest;
+import org.jeecg.modules.app.vo.agreement.AppAgreementVoResponse;
 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.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,4 +21,22 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProtocolServiceImpl extends ServiceImpl<ProtocolMapper, Protocol> implements IProtocolService {
 
+
+    @Autowired
+    ProtocolMapper protocolMapper;
+
+    @Override
+    public Protocol findByInsuranceName(Integer insuranceName,String id) {
+        return protocolMapper.findByInsuranceName(insuranceName,id);
+    }
+
+    @Override
+    public Result<AppAgreementVoResponse> findByType(AppAgreementVORequest appAgreementVORequest) {
+
+        if (ObjectUtils.isEmpty(appAgreementVORequest.getProtocolType())||ObjectUtils.isEmpty(appAgreementVORequest.getInsuranceName())){
+            return Result.error("保险公司和协议类型不能同时为空");
+        }
+        AppAgreementVoResponse appAgreementVoResponse =  protocolMapper.findByType(appAgreementVORequest);
+        return Result.ok(appAgreementVoResponse);
+    }
 }